openstack/python-cinderclient
Code Issues Proposed changes

Merge "Add timeout parameter in requests"

Browse Source
This commit is contained in:
Jenkins 2013-08-14 06:49:45 +00:00 committed by Gerrit Code Review
commit 2f5c937d4c
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.proxy_token = proxy_token
self.proxy_tenant_id = proxy_tenant_id
self.timeout = timeout
if insecure:
self.verify_cert = False
@ -133,6 +134,8 @@ class HTTPClient(object):
kwargs['data'] = json.dumps(kwargs['body'])
del kwargs['body']
if self.timeout:
kwargs.setdefault('timeout', self.timeout)
self.http_log_req((url, method,), kwargs)
resp = requests.request(
method,