Skip to content

Commit 481f74c

Browse files
committed
Low-level API: Don't log just before raising an exception
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
1 parent e988770 commit 481f74c

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

swiftclient/client.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,8 @@ def read(self, length=None):
307307
try:
308308
buf = self.resp.read(length)
309309
self.bytes_read += len(buf)
310-
except (socket.error, RequestException) as e:
310+
except (socket.error, RequestException):
311311
if self.conn.attempts > self.conn.retries:
312-
logger.exception(e)
313312
raise
314313
if (not buf and self.bytes_read < self.expected_length and
315314
self.conn.attempts <= self.conn.retries):
@@ -1659,10 +1658,9 @@ def _retry(self, reset_func, func, *args, **kwargs):
16591658
return rv
16601659
except SSLError:
16611660
raise
1662-
except (socket.error, RequestException) as e:
1661+
except (socket.error, RequestException):
16631662
self._add_response_dict(caller_response_dict, kwargs)
16641663
if self.attempts > self.retries:
1665-
logger.exception(e)
16661664
raise
16671665
self.http_conn = None
16681666
except ClientException as err:
@@ -1677,11 +1675,9 @@ def _retry(self, reset_func, func, *args, **kwargs):
16771675
self.url = self.token = self.service_token = None
16781676

16791677
if retried_auth or not should_retry:
1680-
logger.exception(err)
16811678
raise
16821679
retried_auth = True
16831680
elif self.attempts > self.retries or err.http_status is None:
1684-
logger.exception(err)
16851681
raise
16861682
elif err.http_status == 408:
16871683
self.http_conn = None
@@ -1690,7 +1686,6 @@ def _retry(self, reset_func, func, *args, **kwargs):
16901686
elif self.retry_on_ratelimit and err.http_status == 498:
16911687
pass
16921688
else:
1693-
logger.exception(err)
16941689
raise
16951690
sleep(backoff)
16961691
backoff = min(backoff * 2, self.max_backoff)

0 commit comments

Comments
 (0)