Added log statements in swift client
Added log statements in swiftclient/client.py:_retry where exceptions are being raised. Fixes bug# 1202229 Change-Id: I727537177849d08bb9603aa884152bdebc62fb85
This commit is contained in:
parent
07d13b5262
commit
2f84a4e76b
@ -1132,20 +1132,23 @@ class Connection(object):
|
|||||||
rv = func(self.url, self.token, *args, **kwargs)
|
rv = func(self.url, self.token, *args, **kwargs)
|
||||||
self._add_response_dict(caller_response_dict, kwargs)
|
self._add_response_dict(caller_response_dict, kwargs)
|
||||||
return rv
|
return rv
|
||||||
except (socket.error, HTTPException):
|
except (socket.error, HTTPException) as e:
|
||||||
self._add_response_dict(caller_response_dict, kwargs)
|
self._add_response_dict(caller_response_dict, kwargs)
|
||||||
if self.attempts > self.retries:
|
if self.attempts > self.retries:
|
||||||
|
logger.exception(e)
|
||||||
raise
|
raise
|
||||||
self.http_conn = None
|
self.http_conn = None
|
||||||
except ClientException as err:
|
except ClientException as err:
|
||||||
self._add_response_dict(caller_response_dict, kwargs)
|
self._add_response_dict(caller_response_dict, kwargs)
|
||||||
if self.attempts > self.retries:
|
if self.attempts > self.retries:
|
||||||
|
logger.exception(err)
|
||||||
raise
|
raise
|
||||||
if err.http_status == 401:
|
if err.http_status == 401:
|
||||||
self.url = self.token = None
|
self.url = self.token = None
|
||||||
if retried_auth or not all((self.authurl,
|
if retried_auth or not all((self.authurl,
|
||||||
self.user,
|
self.user,
|
||||||
self.key)):
|
self.key)):
|
||||||
|
logger.exception(err)
|
||||||
raise
|
raise
|
||||||
retried_auth = True
|
retried_auth = True
|
||||||
elif err.http_status == 408:
|
elif err.http_status == 408:
|
||||||
@ -1153,6 +1156,7 @@ class Connection(object):
|
|||||||
elif 500 <= err.http_status <= 599:
|
elif 500 <= err.http_status <= 599:
|
||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
|
logger.exception(err)
|
||||||
raise
|
raise
|
||||||
sleep(backoff)
|
sleep(backoff)
|
||||||
backoff = min(backoff * 2, self.max_backoff)
|
backoff = min(backoff * 2, self.max_backoff)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user