02d017022b
When a untranslated error message pass through the translation pecan hook, the previous translated error is send to the client. This patch fix that by reseting the "translatable_error" of the translation pecan hook before each request. Change-Id: Icee79cf09fd696655048c7c0cf8a3d6706e31701 Fixes: bug #1260398
84 lines
2.6 KiB
Python
84 lines
2.6 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2012 New Dream Network, LLC (DreamHost)
|
|
#
|
|
# Author: Doug Hellmann <doug.hellmann@dreamhost.com>
|
|
# Angus Salkeld <asalkeld@redhat.com>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import threading
|
|
|
|
from oslo.config import cfg
|
|
from pecan import hooks
|
|
|
|
from ceilometer import pipeline
|
|
from ceilometer import transformer
|
|
|
|
|
|
class ConfigHook(hooks.PecanHook):
|
|
"""Attach the configuration object to the request
|
|
so controllers can get to it.
|
|
"""
|
|
|
|
def before(self, state):
|
|
state.request.cfg = cfg.CONF
|
|
|
|
|
|
class DBHook(hooks.PecanHook):
|
|
|
|
def __init__(self, storage_engine, storage_connection):
|
|
self.storage_engine = storage_engine
|
|
self.storage_connection = storage_connection
|
|
|
|
def before(self, state):
|
|
state.request.storage_engine = self.storage_engine
|
|
state.request.storage_conn = self.storage_connection
|
|
|
|
|
|
class PipelineHook(hooks.PecanHook):
|
|
'''Create and attach a pipeline to the request so that
|
|
new samples can be posted via the /v2/meters/ API.
|
|
'''
|
|
|
|
pipeline_manager = None
|
|
|
|
def __init__(self):
|
|
if self.__class__.pipeline_manager is None:
|
|
# this is done here as the cfg options are not available
|
|
# when the file is imported.
|
|
self.__class__.pipeline_manager = pipeline.setup_pipeline(
|
|
transformer.TransformerExtensionManager(
|
|
'ceilometer.transformer'))
|
|
|
|
def before(self, state):
|
|
state.request.pipeline_manager = self.pipeline_manager
|
|
|
|
|
|
class TranslationHook(hooks.PecanHook):
|
|
|
|
def __init__(self):
|
|
# Use thread local storage to make this thread safe in situations
|
|
# where one pecan instance is being used to serve multiple request
|
|
# threads.
|
|
self.local_error = threading.local()
|
|
self.local_error.translatable_error = None
|
|
|
|
def before(self, state):
|
|
self.local_error.translatable_error = None
|
|
|
|
def after(self, state):
|
|
if hasattr(state.response, 'translatable_error'):
|
|
self.local_error.translatable_error = (
|
|
state.response.translatable_error)
|