diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-17 08:23:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-17 08:23:51 +0000 |
| commit | 59bc07526ee7eac1ee87923b0f62b042bd6e1caf (patch) | |
| tree | 13bdebaf18fb72d6afa7baf6b84b25adee69b8a4 | |
| parent | 2dd52511cf8b7b9e5c7c7cd8564b0fec8acd03cb (diff) | |
| parent | 72f96b0d37ce870f52a9b6b05fb698fcac062f43 (diff) | |
Merge "Prefixing the request id with 'req-' to decrease confusion when looking at logs."
| -rw-r--r-- | nova/context.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_wsgi.py | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/nova/context.py b/nova/context.py index 79ad0934d..b0c0603a8 100644 --- a/nova/context.py +++ b/nova/context.py @@ -59,7 +59,7 @@ class RequestContext(object): timestamp = utils.parse_strtime(timestamp) self.timestamp = timestamp if not request_id: - request_id = unicode(uuid.uuid4()) + request_id = 'req-' + str(utils.gen_uuid()) self.request_id = request_id self.auth_token = auth_token self.strategy = strategy diff --git a/nova/tests/api/openstack/test_wsgi.py b/nova/tests/api/openstack/test_wsgi.py index 8807c9128..a0bbb6b9d 100644 --- a/nova/tests/api/openstack/test_wsgi.py +++ b/nova/tests/api/openstack/test_wsgi.py @@ -226,12 +226,22 @@ class RequestHeadersDeserializerTest(test.TestCase): class ResponseHeadersSerializerTest(test.TestCase): def test_request_id(self): serializer = wsgi.ResponseHeadersSerializer() + context = nova.context.get_admin_context() req = webob.Request.blank('/', environ={'nova.context': context}) res = webob.Response(request=req) serializer.serialize(res, {}, 'foo') - self.assertTrue( - utils.is_uuid_like(res.headers['X-Compute-Request-Id'])) + h1 = res.headers.get('X-Compute-Request-Id') + self.assertTrue(h1) + + context = nova.context.get_admin_context() + req = webob.Request.blank('/', environ={'nova.context': context}) + res = webob.Response(request=req) + serializer.serialize(res, {}, 'foo') + h2 = res.headers.get('X-Compute-Request-Id') + self.assertTrue(h2) + + self.assertNotEqual(h1, h2) class JSONSerializer(object): |