summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAditi Raveesh <aditirav@thoughtworks.com>2013-05-17 10:32:38 +0530
committerAditi Raveesh <aditirav@thoughtworks.com>2013-05-23 10:10:11 +0530
commit26ecf7b02377b860b4412aa554ed2392f42f8d40 (patch)
treec90288c94aebbb8e1d2d1889cdc89d16d61b0d2f
parentaf7048590dac77806dd3e7c97a736fda52c2389b (diff)
downloadnova-26ecf7b02377b860b4412aa554ed2392f42f8d40.tar.gz
nova-26ecf7b02377b860b4412aa554ed2392f42f8d40.tar.xz
nova-26ecf7b02377b860b4412aa554ed2392f42f8d40.zip
Importing correlation_id middleware from oslo-incubator
Including 'correlation_id' middleware from oslo-incubator. Adding this to openstack-common.conf to copy over the middleware to the location nova/openstack/common/middleware Change-Id: I21b27e8dae585345d03d59c125d9e1bbea95f830 Implements: blueprint cross-service-request-id
-rw-r--r--nova/openstack/common/middleware/__init__.py0
-rw-r--r--nova/openstack/common/middleware/correlation_id.py29
-rw-r--r--openstack-common.conf1
3 files changed, 30 insertions, 0 deletions
diff --git a/nova/openstack/common/middleware/__init__.py b/nova/openstack/common/middleware/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/nova/openstack/common/middleware/__init__.py
diff --git a/nova/openstack/common/middleware/correlation_id.py b/nova/openstack/common/middleware/correlation_id.py
new file mode 100644
index 000000000..b04f81922
--- /dev/null
+++ b/nova/openstack/common/middleware/correlation_id.py
@@ -0,0 +1,29 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2013 Rackspace Hosting
+# All Rights Reserved.
+#
+# 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.
+
+"""Middleware that attaches a correlation id to WSGI request"""
+
+from nova.openstack.common import uuidutils
+from nova import wsgi
+
+
+class CorrelationIdMiddleware(wsgi.Middleware):
+
+ def process_request(self, req):
+ correlation_id = (req.headers.get("X_CORRELATION_ID") or
+ uuidutils.generate_uuid())
+ req.headers['X_CORRELATION_ID'] = correlation_id
diff --git a/openstack-common.conf b/openstack-common.conf
index 086796b12..297029dc1 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -18,6 +18,7 @@ module=lockutils
module=log
module=loopingcall
module=memorycache
+module=middleware.correlation_id
module=network_utils
module=notifier
module=patch_tox_venv