openstack
/
oslo-incubator
Code Issues Proposed changes

Merge "apiclient.exceptions.from_response() may miss request_id"

This commit is contained in:
Jenkins 2014-04-17 02:37:27 +00:00 committed by Gerrit Code Review
parent a55287996d 3fb053c830
commit a745baad76
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack/common/apiclient/exceptions.py
View File

@ -425,12 +425,17 @@ def from_response(response, method, url):
:param method: HTTP method used for request
:param url: URL used for request
"""
req_id = response.headers.get("x-openstack-request-id")
#NOTE(hdd) true for older versions of nova and cinder
if not req_id:
req_id = response.headers.get("x-compute-request-id")
kwargs = {
"http_status": response.status_code,
"response": response,
"method": method,
"url": url,
"request_id": response.headers.get("x-compute-request-id"),
"request_id": req_id,
}
if "retry-after" in response.headers:
kwargs["retry_after"] = response.headers["retry-after"]