From 38edbc8b8b2360f4733b77c0a2420071e6e0b55b Mon Sep 17 00:00:00 2001 From: echel0n Date: Mon, 16 Jun 2014 20:35:52 -0700 Subject: [PATCH] Logging for tornado.access is now sent to NullHandler so it doesnt complain that it has no handler, still disables logging for tornado.access --- sickbeard/logger.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sickbeard/logger.py b/sickbeard/logger.py index 98201a92..368dbf30 100644 --- a/sickbeard/logger.py +++ b/sickbeard/logger.py @@ -71,14 +71,12 @@ class SBRotatingLogHandler(object): sb_logger = logging.getLogger('sickbeard') sub_logger = logging.getLogger('subliminal') imdb_logger = logging.getLogger('imdbpy') - tornado_general_logger = logging.getLogger('tornado.general') - tornado_application_logger = logging.getLogger('tornado.application') + tornado_logger = logging.getLogger('tornado') sb_logger.removeHandler(handler) sub_logger.removeHandler(handler) imdb_logger.removeHandler(handler) - tornado_general_logger.removeHandler(handler) - tornado_application_logger.removeHandler(handler) + tornado_logger.removeHandler(handler) handler.flush() handler.close() @@ -145,6 +143,9 @@ class SBRotatingLogHandler(object): logging.getLogger('subliminal').setLevel(log_level) logging.getLogger('imdbpy').setLevel(log_level) + # send logging to null + logging.getLogger('tornado.access').addHandler(logging.NullHandler()) + # already logging in new log folder, close the old handler if old_handler: self.close_log(old_handler) @@ -203,8 +204,7 @@ class SBRotatingLogHandler(object): sb_logger = logging.getLogger('sickbeard') sub_logger = logging.getLogger('subliminal') imdb_logger = logging.getLogger('imdbpy') - tornado_general_logger = logging.getLogger('tornado.general') - tornado_application_logger = logging.getLogger('tornado.application') + tornado_logger = logging.getLogger('tornado') # delete the old handler if self.cur_handler: @@ -229,8 +229,7 @@ class SBRotatingLogHandler(object): sb_logger.addHandler(new_file_handler) sub_logger.addHandler(new_file_handler) imdb_logger.addHandler(new_file_handler) - tornado_general_logger.addHandler(new_file_handler) - tornado_application_logger.addHandler(new_file_handler) + tornado_logger.addHandler(new_file_handler) def log(self, toLog, logLevel=MESSAGE): @@ -254,8 +253,7 @@ class SBRotatingLogHandler(object): sub_logger = logging.getLogger('subliminal') imdb_logger = logging.getLogger('imdbpy') - tornado_general_logger = logging.getLogger('tornado.general') - tornado_application_logger = logging.getLogger('tornado.application') + tornado_logger = logging.getLogger('tornado') try: if logLevel == DEBUG: