anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure notification threads exit on shutdown

Browse Source
This commit is contained in:
JonnyWong16
2017-02-25 10:59:51 -08:00
parent 2c5d131019
commit 628cef11fa
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plexpy/__init__.py
View File

@@ -1050,6 +1050,10 @@ def shutdown(restart=False, update=False, checkout=False):
cherrypy.engine.exit() cherrypy.engine.exit()
SCHED.shutdown(wait=False) SCHED.shutdown(wait=False)
# Stop the notification threads
for i in range(CONFIG.NOTIFICATION_THREADS):
NOTIFY_QUEUE.put(None)
CONFIG.write() CONFIG.write()
if not restart and not update and not checkout: if not restart and not update and not checkout:

9
plexpy/notification_handler.py
View File

@@ -41,16 +41,21 @@ def process_queue():
queue = plexpy.NOTIFY_QUEUE queue = plexpy.NOTIFY_QUEUE
while True: while True:
params = queue.get() params = queue.get()
if params:
if params is None:
break
elif params:
if 'notifier_id' in params: if 'notifier_id' in params:
notify(**params) notify(**params)
else: else:
add_notifier_each(**params) add_notifier_each(**params)
queue.task_done() queue.task_done()
logger.info(u"PlexPy NotificationHandler :: Notification thread exiting...")
def start_threads(num_threads=1): def start_threads(num_threads=1):
logger.info(u"PlexPy NotificationHandler :: Starting background notification handler.") logger.info(u"PlexPy NotificationHandler :: Starting background notification handler ({} threads).".format(num_threads))
for x in range(num_threads): for x in range(num_threads):
thread = threading.Thread(target=process_queue) thread = threading.Thread(target=process_queue)
thread.daemon = True thread.daemon = True