monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-21 17:13:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added logging for tornado web server for helping in debugging issues.

Browse source
This commit is contained in:
echel0n 2014-06-16 19:55:46 -07:00
parent 09297b853b
commit c57e34c9f9
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sickbeard/logger.py
View file

@ -71,10 +71,12 @@ class SBRotatingLogHandler(object):
sb_logger = logging.getLogger('sickbeard') sb_logger = logging.getLogger('sickbeard')
sub_logger = logging.getLogger('subliminal') sub_logger = logging.getLogger('subliminal')
imdb_logger = logging.getLogger('imdbpy') imdb_logger = logging.getLogger('imdbpy')
tornado_logger = logging.getLogger('tornado')
sb_logger.removeHandler(handler) sb_logger.removeHandler(handler)
sub_logger.removeHandler(handler) sub_logger.removeHandler(handler)
imdb_logger.removeHandler(handler) imdb_logger.removeHandler(handler)
tornado_logger.removeHandler(handler)
handler.flush() handler.flush()
handler.close() handler.close()
@ -108,12 +110,16 @@ class SBRotatingLogHandler(object):
{'sickbeard': logging.Formatter('%(asctime)s %(levelname)s::%(message)s', '%H:%M:%S'), {'sickbeard': logging.Formatter('%(asctime)s %(levelname)s::%(message)s', '%H:%M:%S'),
'subliminal': logging.Formatter('%(asctime)s %(levelname)s::SUBLIMINAL :: %(message)s', 'subliminal': logging.Formatter('%(asctime)s %(levelname)s::SUBLIMINAL :: %(message)s',
'%H:%M:%S'), '%H:%M:%S'),
'imdbpy': logging.Formatter('%(asctime)s %(levelname)s::IMDBPY :: %(message)s', '%H:%M:%S') 'imdbpy': logging.Formatter('%(asctime)s %(levelname)s::IMDBPY :: %(message)s', '%H:%M:%S'),
'tornado.access': logging.Formatter('%(asctime)s %(levelname)s::TORNADO :: %(message)s', '%H:%M:%S'),
'tornado.general': logging.Formatter('%(asctime)s %(levelname)s::TORNADO :: %(message)s', '%H:%M:%S'),
'tornado.application': logging.Formatter('%(asctime)s %(levelname)s::TORNADO :: %(message)s', '%H:%M:%S')
}, },
logging.Formatter('%(message)s'), )) logging.Formatter('%(message)s'), ))
# add the handler to the root logger # add the handler to the root logger
logging.getLogger('sickbeard').addHandler(console) logging.getLogger('sickbeard').addHandler(console)
logging.getLogger('tornado').addHandler(console)
logging.getLogger('subliminal').addHandler(console) logging.getLogger('subliminal').addHandler(console)
logging.getLogger('imdbpy').addHandler(console) logging.getLogger('imdbpy').addHandler(console)
@ -121,10 +127,12 @@ class SBRotatingLogHandler(object):
self.cur_handler = self._config_handler() self.cur_handler = self._config_handler()
logging.getLogger('sickbeard').addHandler(self.cur_handler) logging.getLogger('sickbeard').addHandler(self.cur_handler)
logging.getLogger('tornado').addHandler(self.cur_handler)
logging.getLogger('subliminal').addHandler(self.cur_handler) logging.getLogger('subliminal').addHandler(self.cur_handler)
logging.getLogger('imdbpy').addHandler(self.cur_handler) logging.getLogger('imdbpy').addHandler(self.cur_handler)
logging.getLogger('sickbeard').setLevel(DB) logging.getLogger('sickbeard').setLevel(DB)
logging.getLogger('tornado').setLevel(logging.WARNING)
logging.getLogger('subliminal').setLevel(logging.WARNING) logging.getLogger('subliminal').setLevel(logging.WARNING)
logging.getLogger('imdbpy').setLevel(logging.WARNING) logging.getLogger('imdbpy').setLevel(logging.WARNING)
@ -151,7 +159,10 @@ class SBRotatingLogHandler(object):
{'sickbeard': logging.Formatter('%(asctime)s %(levelname)-8s %(message)s', '%Y-%m-%d %H:%M:%S'), {'sickbeard': logging.Formatter('%(asctime)s %(levelname)-8s %(message)s', '%Y-%m-%d %H:%M:%S'),
'subliminal': logging.Formatter('%(asctime)s %(levelname)-8s SUBLIMINAL :: %(message)s', 'subliminal': logging.Formatter('%(asctime)s %(levelname)-8s SUBLIMINAL :: %(message)s',
'%Y-%m-%d %H:%M:%S'), '%Y-%m-%d %H:%M:%S'),
'imdbpy': logging.Formatter('%(asctime)s %(levelname)-8s IMDBPY :: %(message)s', '%Y-%m-%d %H:%M:%S') 'imdbpy': logging.Formatter('%(asctime)s %(levelname)-8s IMDBPY :: %(message)s', '%Y-%m-%d %H:%M:%S'),
#'tornado.access': logging.Formatter('%(asctime)s %(levelname)-8s TORNADO :: %(message)s','%Y-%m-%d %H:%M:%S'),
'tornado.general': logging.Formatter('%(asctime)s %(levelname)-8s TORNADO :: %(message)s', '%Y-%m-%d %H:%M:%S'),
'tornado.application': logging.Formatter('%(asctime)s %(levelname)-8s TORNADO :: %(message)s', '%Y-%m-%d %H:%M:%S')
}, },
logging.Formatter('%(message)s'), )) logging.Formatter('%(message)s'), ))
@ -184,6 +195,7 @@ class SBRotatingLogHandler(object):
sb_logger = logging.getLogger('sickbeard') sb_logger = logging.getLogger('sickbeard')
sub_logger = logging.getLogger('subliminal') sub_logger = logging.getLogger('subliminal')
imdb_logger = logging.getLogger('imdbpy') imdb_logger = logging.getLogger('imdbpy')
tornado_logger = logging.getLogger('tornado')
# delete the old handler # delete the old handler
if self.cur_handler: if self.cur_handler:
@ -208,6 +220,7 @@ class SBRotatingLogHandler(object):
sb_logger.addHandler(new_file_handler) sb_logger.addHandler(new_file_handler)
sub_logger.addHandler(new_file_handler) sub_logger.addHandler(new_file_handler)
imdb_logger.addHandler(new_file_handler) imdb_logger.addHandler(new_file_handler)
tornado_logger.addHandler(new_file_handler)
def log(self, toLog, logLevel=MESSAGE): def log(self, toLog, logLevel=MESSAGE):
@ -231,6 +244,7 @@ class SBRotatingLogHandler(object):
sub_logger = logging.getLogger('subliminal') sub_logger = logging.getLogger('subliminal')
imdb_logger = logging.getLogger('imdbpy') imdb_logger = logging.getLogger('imdbpy')
tornado_logger = logging.getLogger('tornado')
try: try:
if logLevel == DEBUG: if logLevel == DEBUG:

2
sickbeard/webserveInit.py
View file

@ -4,6 +4,7 @@ import sickbeard
import webserve import webserve
import webapi import webapi
import tornado.options
from sickbeard import logger from sickbeard import logger
from sickbeard.helpers import create_https_certificates from sickbeard.helpers import create_https_certificates
from tornado.web import Application, StaticFileHandler, RedirectHandler, HTTPError from tornado.web import Application, StaticFileHandler, RedirectHandler, HTTPError
@ -97,7 +98,6 @@ def initWebServer(options={}):
# Load the app # Load the app
app = Application([], app = Application([],
log_function=lambda x: None,
debug=False, debug=False,
gzip=True, gzip=True,
autoreload=sickbeard.AUTO_UPDATE, autoreload=sickbeard.AUTO_UPDATE,