github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-14 01:02:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try to cleanly shutdown loggers

Browse source
This commit is contained in:
JonnyWong16 2018-01-20 11:27:58 -08:00
parent 79609c384e
commit 0fad245148
3 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
plexpy/__init__.py
View file

@ -1587,6 +1587,7 @@ def upgrade():
def shutdown(restart=False, update=False, checkout=False): def shutdown(restart=False, update=False, checkout=False):
cherrypy.engine.exit() cherrypy.engine.exit()
SCHED.shutdown(wait=False) SCHED.shutdown(wait=False)
activity_handler.ACTIVITY_SCHED.shutdown(wait=False)
# Stop the notification threads # Stop the notification threads
for i in range(CONFIG.NOTIFICATION_THREADS): for i in range(CONFIG.NOTIFICATION_THREADS):
@ -1617,23 +1618,35 @@ def shutdown(restart=False, update=False, checkout=False):
if restart: if restart:
logger.info(u"Tautulli is restarting...") logger.info(u"Tautulli is restarting...")
exe = sys.executable exe = sys.executable
args = [exe, FULL_PATH] args = [exe, FULL_PATH]
args += ARGS args += ARGS
if '--nolaunch' not in args: if '--nolaunch' not in args:
args += ['--nolaunch'] args += ['--nolaunch']
# os.execv fails with spaced names on Windows # Separate out logger so we can shutdown logger after
# https://bugs.python.org/issue19066
if NOFORK: if NOFORK:
logger.info('Running as service, not forking. Exiting...') logger.info('Running as service, not forking. Exiting...')
elif os.name == 'nt': elif os.name == 'nt':
logger.info('Restarting Tautulli with %s', args) logger.info('Restarting Tautulli with %s', args)
subprocess.Popen(args, cwd=os.getcwd())
else: else:
logger.info('Restarting Tautulli with %s', args) logger.info('Restarting Tautulli with %s', args)
logger.shutdown()
# os.execv fails with spaced names on Windows
# https://bugs.python.org/issue19066
if NOFORK:
pass
elif os.name == 'nt':
subprocess.Popen(args, cwd=os.getcwd())
else:
os.execv(exe, args) os.execv(exe, args)
else:
logger.shutdown()
os._exit(0) os._exit(0)

5
plexpy/logger.py
View file

@ -306,6 +306,11 @@ def initHooks(global_exceptions=True, thread_exceptions=True, pass_original=True
# Monkey patch the run() by monkey patching the __init__ method # Monkey patch the run() by monkey patching the __init__ method
threading.Thread.__init__ = new_init threading.Thread.__init__ = new_init
def shutdown():
logging.shutdown()
# Expose logger methods # Expose logger methods
# Main Tautulli logger # Main Tautulli logger
info = logger.info info = logger.info

3
plexpy/web_socket.py
View file

@ -176,6 +176,7 @@ def process(opcode, data):
return False return False
try: try:
logger.websocket_debug(data)
info = json.loads(data) info = json.loads(data)
except Exception as e: except Exception as e:
logger.warn(u"Tautulli WebSocket :: Error decoding message from websocket: %s" % e) logger.warn(u"Tautulli WebSocket :: Error decoding message from websocket: %s" % e)
@ -189,7 +190,6 @@ def process(opcode, data):
return False return False
if type == 'playing': if type == 'playing':
logger.websocket_debug(data)
time_line = info.get('PlaySessionStateNotification', info.get('_children', {})) time_line = info.get('PlaySessionStateNotification', info.get('_children', {}))
if not time_line: if not time_line:
@ -203,7 +203,6 @@ def process(opcode, data):
logger.error(u"Tautulli WebSocket :: Failed to process session data: %s." % e) logger.error(u"Tautulli WebSocket :: Failed to process session data: %s." % e)
if type == 'timeline': if type == 'timeline':
logger.websocket_debug(data)
time_line = info.get('TimelineEntry', info.get('_children', {})) time_line = info.get('TimelineEntry', info.get('_children', {}))
if not time_line: if not time_line: