From cbcf42d0bc72d905e924598ae1deb9e1988183dc Mon Sep 17 00:00:00 2001 From: JackDandy Date: Fri, 6 Nov 2020 10:45:13 +0000 Subject: [PATCH] Change downgrade network conversions/timezone warnings on startup to debug level. Change add logger.debug, logger.warning, and logger.error functions. --- CHANGES.md | 1 + sickbeard/logger.py | 24 ++++++++++++++++++++++++ sickbeard/network_timezones.py | 8 +++----- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 985ccdb..593549a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -41,6 +41,7 @@ * Change add a test for both require and ignore show specific words with partial match, both should fail * Change init showDict for all unit tests * Change add error handling for zoneinfo update file parsing +* Change downgrade network conversions/timezone warnings on startup to debug level * Add enum34 1.1.10 * Add humanize 3.1.0 (aec9dc2) * Update included fallback timezone info file to 2020d diff --git a/sickbeard/logger.py b/sickbeard/logger.py index 6c1b404..516a5fe 100644 --- a/sickbeard/logger.py +++ b/sickbeard/logger.py @@ -389,6 +389,30 @@ class TimedCompressedRotatingFileHandler(TimedRotatingFileHandler): sb_log_instance = SBRotatingLogHandler('sickgear.log') +def debug(to_log): + # type: (AnyStr) -> None + """ log message flagged as debug + :param to_log: log message + """ + sb_log_instance.log(to_log, DEBUG) + + +def warning(to_log): + # type: (AnyStr) -> None + """ log message flagged as warning + :param to_log: log message + """ + sb_log_instance.log(to_log, WARNING) + + +def error(to_log): + # type: (AnyStr) -> None + """ log message flagged as error + :param to_log: log message + """ + sb_log_instance.log(to_log, ERROR) + + def log(to_log, log_level=MESSAGE): # type: (Union[AnyStr, list], int) -> None """ diff --git a/sickbeard/network_timezones.py b/sickbeard/network_timezones.py index b5834b6..6089fde 100644 --- a/sickbeard/network_timezones.py +++ b/sickbeard/network_timezones.py @@ -272,11 +272,10 @@ def update_network_dict(): url = 'https://raw.githubusercontent.com/Prinz23/sb_network_timezones/master/network_timezones.txt' url_data = helpers.get_url(url) - if None is url_data: + if url_data in (None, ''): update_last_retry() # When None is urlData, trouble connecting to github - logger.log(u'Updating network timezones failed, this can happen from time to time. URL: %s' % url, - logger.WARNING) + logger.debug(u'Updating network timezones failed, this can happen from time to time. URL: %s' % url) load_network_dict(load=False) return @@ -504,8 +503,7 @@ def _load_network_conversions(): if url_data in (None, ''): update_last_retry() # when no url_data, trouble connecting to github - logger.log(u'Updating network conversions failed, this can happen from time to time. URL: %s' % url, - logger.WARNING) + logger.debug(u'Updating network conversions failed, this can happen from time to time. URL: %s' % url) return reset_last_retry()