openstack/python-swiftclient
Code Issues Proposed changes

Low-level API: Don't log just before raising an exception

Browse Source 
The only logging we should do is when we've encountered a problem *and
we've dealt with it ourselves*. When we're raising an exception, it
should be up to the caller to decide whether to log anything about it.

Anything else is just rude.

Change-Id: I1c96b76d90a78b7a10ffe63e4a7440c8f579147c
Closes-Bug:  1213179
Related-Bug: 1202229
This commit is contained in:
Tim Burke
2016-10-28 12:19:35 +02:00
parent e9887703d0
commit 481f74caf1
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
swiftclient/client.py
View File

@@ -307,9 +307,8 @@ class _RetryBody(_ObjectBody):
try: try:
buf = self.resp.read(length) buf = self.resp.read(length)
self.bytes_read += len(buf) self.bytes_read += len(buf)
except (socket.error, RequestException) as e: except (socket.error, RequestException):
if self.conn.attempts > self.conn.retries: if self.conn.attempts > self.conn.retries:
logger.exception(e)
raise raise
if (not buf and self.bytes_read < self.expected_length and if (not buf and self.bytes_read < self.expected_length and
self.conn.attempts <= self.conn.retries): self.conn.attempts <= self.conn.retries):
@@ -1659,10 +1658,9 @@ class Connection(object):
return rv return rv
except SSLError: except SSLError:
raise raise
except (socket.error, RequestException) as e: except (socket.error, RequestException):
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:
@@ -1677,11 +1675,9 @@ class Connection(object):
self.url = self.token = self.service_token = None self.url = self.token = self.service_token = None
if retried_auth or not should_retry: if retried_auth or not should_retry:
logger.exception(err)
raise raise
retried_auth = True retried_auth = True
elif self.attempts > self.retries or err.http_status is None: elif self.attempts > self.retries or err.http_status is None:
logger.exception(err)
raise raise
elif err.http_status == 408: elif err.http_status == 408:
self.http_conn = None self.http_conn = None
@@ -1690,7 +1686,6 @@ class Connection(object):
elif self.retry_on_ratelimit and err.http_status == 498: elif self.retry_on_ratelimit and err.http_status == 498:
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)