nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Handle multiple SIGTERM

Browse Source
This commit is contained in:
nemunaire 2017-06-23 20:07:22 +02:00 committed by Pierre-Olivier Mercier
parent 58c349eb2c
commit 35e0890563
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nemubot/bot.py
View File

@ -149,6 +149,8 @@ class Bot(threading.Thread):
def run(self): def run(self):
global sync_queue
self._poll.register(sync_queue._reader, select.POLLIN | select.POLLPRI) self._poll.register(sync_queue._reader, select.POLLIN | select.POLLPRI)
logger.info("Starting main loop") logger.info("Starting main loop")
@ -222,6 +224,7 @@ class Bot(threading.Thread):
c = Consumer(self) c = Consumer(self)
self.cnsr_thrd.append(c) self.cnsr_thrd.append(c)
c.start() c.start()
sync_queue = None
logger.info("Ending main loop") logger.info("Ending main loop")
@ -566,9 +569,10 @@ class Bot(threading.Thread):
self.datastore.close() self.datastore.close()
self.stop = True if self.stop is False or sync_queue is not None:
sync_act("end") self.stop = True
sync_queue.join() sync_act("end")
sync_queue.join()
# Treatment # Treatment