9e07e7d971
TranslationHook was using a threading.local() to store an error message however the threading.local() was being created in __init__ of the Hook. Hooks are not per request, so this wasn't really working as planned. Now, instead of using threading.local() at all, we just modify the environ held by pecan (and later used by the ParsableErrorMiddleware). environ is request-local. This change feels a bit crufty because it is but because of the way Exceptions are managed in the app there's not really any good way to do it. We could consider changing the way Exceptions related to error messages, but that would be a very large change. Change-Id: I463059df28f291cea0644b1a9908a907f146ba1f Closes-Bug: #1481244
54 lines
1.7 KiB
Python
54 lines
1.7 KiB
Python
#
|
|
# Copyright 2012 New Dream Network, LLC (DreamHost)
|
|
#
|
|
# 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.
|
|
|
|
from oslo_policy import policy
|
|
from pecan import hooks
|
|
|
|
|
|
class ConfigHook(hooks.PecanHook):
|
|
"""Attach the configuration and policy enforcer object to the request.
|
|
|
|
That allows controllers to get it.
|
|
"""
|
|
|
|
def __init__(self, conf):
|
|
self.conf = conf
|
|
self.enforcer = policy.Enforcer(conf)
|
|
|
|
def before(self, state):
|
|
state.request.cfg = self.conf
|
|
state.request.enforcer = self.enforcer
|
|
|
|
|
|
class DBHook(hooks.PecanHook):
|
|
|
|
def __init__(self, alarm_conn):
|
|
self.alarm_storage_connection = alarm_conn
|
|
|
|
def before(self, state):
|
|
state.request.alarm_storage_conn = self.alarm_storage_connection
|
|
|
|
|
|
class TranslationHook(hooks.PecanHook):
|
|
|
|
def after(self, state):
|
|
# After a request has been done, we need to see if
|
|
# ClientSideError has added an error onto the response.
|
|
# If it has we need to get it info the thread-safe WSGI
|
|
# environ to be used by the ParsableErrorMiddleware.
|
|
if hasattr(state.response, 'translatable_error'):
|
|
state.request.environ['translatable_error'] = (
|
|
state.response.translatable_error)
|