From 1b2d6895a9ff35ba4c8b006b248d0cb85303d799 Mon Sep 17 00:00:00 2001 From: David Douard Date: Thu, 31 Jan 2019 16:07:21 +0100 Subject: [PATCH] Use the named logger instead of the root logger in lister_base.py --- swh/lister/core/lister_base.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/swh/lister/core/lister_base.py b/swh/lister/core/lister_base.py index 9db8c31..ce8a54b 100644 --- a/swh/lister/core/lister_base.py +++ b/swh/lister/core/lister_base.py @@ -200,11 +200,11 @@ class SWHListerBase(abc.ABC, config.SWHConfig): self.string_pattern_check(inner, lower, upper) except Exception as e: - logging.error(str(e) + ': %s, %s, %s' % - (('inner=%s%s' % (type(inner), inner)), + logger.error(str(e) + ': %s, %s, %s' % + (('inner=%s%s' % (type(inner), inner)), ('lower=%s%s' % (type(lower), lower)), ('upper=%s%s' % (type(upper), upper))) - ) + ) raise return ret @@ -249,7 +249,7 @@ class SWHListerBase(abc.ABC, config.SWHConfig): def __init__(self, override_config=None): self.backoff = self.INITIAL_BACKOFF - logging.debug('Loading config from %s' % self.CONFIG_BASE_FILENAME) + logger.debug('Loading config from %s' % self.CONFIG_BASE_FILENAME) self.config = self.parse_config_file( base_filename=self.CONFIG_BASE_FILENAME, additional_configs=[self.ADDITIONAL_CONFIG] @@ -297,7 +297,7 @@ class SWHListerBase(abc.ABC, config.SWHConfig): r = self.transport_request(identifier) except FetchError: # network-level connection error, try again - logging.warning( + logger.warning( 'connection error on %s: sleep for %d seconds' % (identifier, self.CONN_SLEEP)) time.sleep(self.CONN_SLEEP) @@ -310,7 +310,7 @@ class SWHListerBase(abc.ABC, config.SWHConfig): # detect throttling must_retry, delay = self.transport_quota_check(r) if must_retry: - logging.warning( + logger.warning( 'rate limited on %s: sleep for %f seconds' % (identifier, delay)) time.sleep(delay) @@ -320,7 +320,7 @@ class SWHListerBase(abc.ABC, config.SWHConfig): retries_left -= 1 if not retries_left: - logging.warning( + logger.warning( 'giving up on %s: max retries exceeded' % identifier) return r @@ -438,7 +438,7 @@ class SWHListerBase(abc.ABC, config.SWHConfig): re.escape(a)) if (isinstance(b, str) and (re.match(a_pattern, b) is None) or isinstance(c, str) and (re.match(a_pattern, c) is None)): - logging.debug(a_pattern) + logger.debug(a_pattern) raise TypeError('incomparable string patterns detected') def inject_repo_data_into_db(self, models_list):