openstack/python-cinderclient
Code Issues Proposed changes

Add timeout parameter in requests

Browse Source 
Fix bug #1207260

Change-Id: I0f57a9b27c2da2521adb6aebfe3fa072c6b56808
This commit is contained in:
Yaguang Tang 2013-08-01 18:22:55 +08:00
parent 53a0344608
commit fd409626fa
1 changed files with 3 additions and 0 deletions

3
cinderclient/client.py

@ -79,6 +79,7 @@ class HTTPClient(object):
self.auth_token = None self.auth_token = None
self.proxy_token = proxy_token self.proxy_token = proxy_token
self.proxy_tenant_id = proxy_tenant_id self.proxy_tenant_id = proxy_tenant_id
self.timeout = timeout
if insecure: if insecure:
self.verify_cert = False self.verify_cert = False
@ -133,6 +134,8 @@ class HTTPClient(object):
kwargs['data'] = json.dumps(kwargs['body']) kwargs['data'] = json.dumps(kwargs['body'])
del kwargs['body'] del kwargs['body']
if self.timeout:
kwargs.setdefault('timeout', self.timeout)
self.http_log_req((url, method,), kwargs) self.http_log_req((url, method,), kwargs)
resp = requests.request( resp = requests.request(
method, method,