From dc5c2cb7f2ddfb8b7311373be423a51cdf700f9f Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Tue, 3 Sep 2013 14:12:11 -0700 Subject: [PATCH] Revert "Importing correlation_id middleware from oslo-incubator" This reverts commit 26ecf7b02377b860b4412aa554ed2392f42f8d40. This patch was merged in preparation for https://review.openstack.org/#/c/29480/ which was never merged. Change-Id: Iefa1478af03f748ccb5f27f8bd4ad0f5b24af070 --- nova/openstack/common/middleware/__init__.py | 0 .../common/middleware/correlation_id.py | 29 ------------------- openstack-common.conf | 1 - 3 files changed, 30 deletions(-) delete mode 100644 nova/openstack/common/middleware/__init__.py delete mode 100644 nova/openstack/common/middleware/correlation_id.py diff --git a/nova/openstack/common/middleware/__init__.py b/nova/openstack/common/middleware/__init__.py deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/nova/openstack/common/middleware/correlation_id.py b/nova/openstack/common/middleware/correlation_id.py deleted file mode 100644 index b04f81922043..000000000000 --- a/nova/openstack/common/middleware/correlation_id.py +++ /dev/null @@ -1,29 +0,0 @@ -# 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 1e223e968973..de03fe43323e 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -19,7 +19,6 @@ module=lockutils module=log module=loopingcall module=memorycache -module=middleware.correlation_id module=network_utils module=notifier module=patch_tox_venv