openstack/tempest
Code Issues Proposed changes

Merge "Move logging from _request() to raw_request()"

Browse Source
This commit is contained in:
Zuul 2019-09-30 07:08:57 +00:00 committed by Gerrit Code Review
commit de20df6954
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tempest/lib/common/rest_client.py
View File

@ -547,18 +547,10 @@ class RestClient(object):
req_url, req_headers, req_body = self.auth_provider.auth_request(
method, url, headers, body, self.filters)
# Do the actual request, and time it
start = time.time()
self._log_request_start(method, req_url)
resp, resp_body = self.raw_request(
req_url, method, headers=req_headers, body=req_body,
chunked=chunked
)
end = time.time()
self._log_request(method, req_url, resp, secs=(end - start),
req_headers=req_headers, req_body=req_body,
resp_body=resp_body)
# Verify HTTP response codes
self.response_checker(method, resp, resp_body)
@ -586,8 +578,17 @@ class RestClient(object):
"""
if headers is None:
headers = self.get_headers()
return self.http_obj.request(url, method, headers=headers,
body=body, chunked=chunked)
# Do the actual request, and time it
start = time.time()
self._log_request_start(method, url)
resp, resp_body = self.http_obj.request(
url, method, headers=headers,
body=body, chunked=chunked)
end = time.time()
self._log_request(method, url, resp, secs=(end - start),
req_headers=headers, req_body=body,
resp_body=resp_body)
return resp, resp_body
def request(self, method, url, extra_headers=False, headers=None,
body=None, chunked=False):