diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-06 18:46:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-06 18:46:16 +0000 |
| commit | 6ed87355005f0797031cab7f57676860da5af820 (patch) | |
| tree | 6045f62a45c25dbcb00ef29e3e871e2ca3cd3e1b /nova/api | |
| parent | f375d962c43df9354e0dbafd0c7525452f157996 (diff) | |
| parent | edcf4eca66c91db032bdb56572eba4437947948d (diff) | |
| download | nova-6ed87355005f0797031cab7f57676860da5af820.tar.gz nova-6ed87355005f0797031cab7f57676860da5af820.tar.xz nova-6ed87355005f0797031cab7f57676860da5af820.zip | |
Merge "Add x-compute-request-id header when no response body"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/wsgi.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py index eda82483f..bf5627b3a 100644 --- a/nova/api/openstack/wsgi.py +++ b/nova/api/openstack/wsgi.py @@ -972,7 +972,6 @@ class Resource(wsgi.Application): # Run post-processing extensions if resp_obj: - _set_request_id_header(request, resp_obj) # Do a preserialize to set up the response object serializers = getattr(meth, 'wsgi_serializers', {}) resp_obj._bind_method_serializers(serializers) @@ -988,6 +987,9 @@ class Resource(wsgi.Application): response = resp_obj.serialize(request, accept, self.default_serializers) + if context and hasattr(response, 'headers'): + response.headers.add('x-compute-request-id', context.request_id) + return response def get_method(self, request, action, content_type, body): |