From 9602284c5d5aa25a70aedf91b80828726bbd48c2 Mon Sep 17 00:00:00 2001 From: Alvaro Lopez Garcia Date: Mon, 29 Oct 2012 15:33:59 +0100 Subject: Move 'opentack.context' and 'openstack.params' definitions to keystone.common.wsgi Change-Id: Idc4f6765cba20e7baadb61e355076695f36d66ea --- keystone/common/wsgi.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'keystone/common/wsgi.py') diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py index 53279c1a..9b42491d 100644 --- a/keystone/common/wsgi.py +++ b/keystone/common/wsgi.py @@ -36,6 +36,13 @@ from keystone.openstack.common import jsonutils LOG = logging.getLogger(__name__) +# Environment variable used to pass the request context +CONTEXT_ENV = 'openstack.context' + + +# Environment variable used to pass the request params +PARAMS_ENV = 'openstack.params' + class WritableLogger(object): """A thin wrapper that responds to `write` and logs.""" @@ -189,9 +196,9 @@ class Application(BaseApplication): LOG.debug('arg_dict: %s', arg_dict) # allow middleware up the stack to provide context & params - context = req.environ.get('openstack.context', {}) + context = req.environ.get(CONTEXT_ENV, {}) context['query_string'] = dict(req.params.iteritems()) - params = req.environ.get('openstack.params', {}) + params = req.environ.get(PARAMS_ENV, {}) params.update(arg_dict) # TODO(termie): do some basic normalization on methods -- cgit