django-botmanager 0.2.22__py3-none-any.whl → 0.2.23__py3-none-any.whl

botmanager/management/commands/bot_manager.py

@@ -3,9 +3,10 @@ import importlib
 import json
 import logging
 import os
+import signal
 import sys
 from datetime import datetime, timedelta
-from multiprocessing import Queue, Process
+from multiprocessing import Queue, Process, Event
 from time import sleep, time
 
 import psutil
@@ -30,6 +31,9 @@ except ImportError:
     setproctitle = lambda x: x
 
 
+PROCESS_TO_FINISH_GRACEFULLY_TIMEOUT = 30  # seconds
+
+
 class BotManagerCommandException(BotManagerBaseCommandException):
     pass
 
@@ -142,7 +146,30 @@ class Command(BotManagerBaseCommand):
         current_pid = os.getpid()
         PidsFileController.add_pid(current_pid)
 
+        shutdown_event = Event()
+
         processes = []
+
+        def signal_handler(signum, frame):
+            logging.info('Main process received signal {}'.format(signum))
+            logging.info('Start shutting down children processes gracefully...')
+            shutdown_event.set()
+
+            # Wait for processes to finish
+            for p in processes:
+                p.join(timeout=PROCESS_TO_FINISH_GRACEFULLY_TIMEOUT)
+                if p.is_alive():
+                    logging.info("Process {} didn't terminate gracefully, forcing...".format(p.pid))
+                    p.terminate()
+
+            logging.info("All children processes have been terminated. Exiting main process {}.".format(current_pid))
+
+            sys.exit(0)
+
+        # Register signal handlers
+        signal.signal(signal.SIGTERM, signal_handler)
+        signal.signal(signal.SIGINT, signal_handler)
+
         queue_dict = {}
         for task_class_string, processes_count in self.config['tasks'].items():
             cls_name = task_class_string.split('.')[-1]
@@ -158,7 +185,7 @@ class Command(BotManagerBaseCommand):
             queue_dict[task_class.name].maxsize = maxsize
 
             for i in range(processes_count):
-                tm = TaskManager(task_class, queue_dict[task_class.name], i + 1, current_pid)
+                tm = TaskManager(task_class, queue_dict[task_class.name], i + 1, current_pid, shutdown_event=shutdown_event)
                 p = Process(target=Command.start_service, args=(tm,))
                 p.name = tm.process_name
                 p.daemon = True
@@ -166,7 +193,7 @@ class Command(BotManagerBaseCommand):
                 processes.append(p)
                 PidsFileController.add_pid(p.pid)
 
-        tf = TaskFetcher(queue_dict, current_pid)
+        tf = TaskFetcher(queue_dict, current_pid, shutdown_event=shutdown_event)
         p = Process(target=Command.start_service, args=(tf,))
         p.name = tf.process_name
         p.daemon = True
@@ -175,7 +202,7 @@ class Command(BotManagerBaseCommand):
         PidsFileController.add_pid(p.pid)
 
         if not options.get('without_sheduller'):
-            ts = TaskSheduler(self.config, current_pid)
+            ts = TaskSheduler(self.config, current_pid, shutdown_event=shutdown_event)
             p = Process(target=Command.start_service, args=(ts,))
             p.name = ts.process_name
             p.daemon = True
@@ -234,16 +261,16 @@ class Command(BotManagerBaseCommand):
 class TaskSheduler(object):
     SET_PERIOD_SECONDS = 5
 
-    def __init__(self, config, parent_pid):
+    def __init__(self, config, parent_pid, shutdown_event=None):
         self.process_name = "BotManager.TaskSheduler"
         self.config = config
         self.parent_pid = parent_pid
         self.shedule_cache = {}
+        self.shutdown_event = shutdown_event
 
     def run(self):
         setproctitle(self.process_name)
-        while True:
-
+        while not self.shutdown_event.is_set():
             if os.getppid() != self.parent_pid:
                 logging.info(u"Parent process is die. Exit..")
                 break
@@ -259,6 +286,7 @@ class TaskSheduler(object):
                         logging.exception(e)
 
             sleep(self.SET_PERIOD_SECONDS)
+        logging.info(u"TaskSheduler process shutdown gracefully.")
 
     def _time_to_set_tasks_for(self, task_class):
         last_shedule_time = self.shedule_cache.get(task_class.name)
@@ -268,11 +296,12 @@ class TaskSheduler(object):
 
 class TaskFetcher(object):
 
-    def __init__(self, queue_dict, parent_pid):
+    def __init__(self, queue_dict, parent_pid, shutdown_event=None):
         self.process_name = "BotManager.TaskFetcher"
         self.queue_dict = queue_dict
         self.parent_pid = parent_pid
         self.config = settings.MAIN_CONFIG
+        self.shutdown_event = shutdown_event
 
     def run(self):
         """
@@ -289,7 +318,7 @@ class TaskFetcher(object):
         """
         setproctitle(self.process_name)
         Task.objects.filter(in_process=True).update(in_process=False)
-        while True:
+        while not self.shutdown_event.is_set():
             try:
 
                 if os.getppid() != self.parent_pid:
@@ -341,6 +370,8 @@ class TaskFetcher(object):
 
             sleep(self.config['fetch_period'])
 
+        logging.info(u"TaskFetcher shutdown gracefully.")
+
     def _get_qsize(self, task):
         try:
             return self.queue_dict[task.name].qsize()
@@ -351,12 +382,13 @@ class TaskFetcher(object):
 
 
 class TaskManager(object):
-    def __init__(self, task_class, queue, process_num, parent_pid):
+    def __init__(self, task_class, queue, process_num, parent_pid, shutdown_event=None):
         self.task_class = task_class
         self.queue = queue
         self.process_num = process_num
         self.process_name = u"BotManager.{0}.{1}".format(self.task_class.name, self.process_num)
         self.parent_pid = parent_pid
+        self.shutdown_event = shutdown_event
 
     def __str__(self):
         return self.process_name
@@ -367,7 +399,7 @@ class TaskManager(object):
 
     def run(self):
         setproctitle(self.process_name)
-        while True:
+        while not self.shutdown_event.is_set():
             try:
 
                 if os.getppid() != self.parent_pid:
@@ -390,6 +422,8 @@ class TaskManager(object):
                     u"Error in queue preparing: %s".format(e)
                 )
 
+        logging.info(u"TaskManager process {} shutdown gracefully.".format(self.process_name))
+
 
 class PidsFileController(object):
     def __init__(self):
@@ -458,4 +492,3 @@ class PidsFileController(object):
 
         if os.path.exists(pids_file_name):
             os.remove(pids_file_name)
-

{django_botmanager-0.2.22.dist-info → django_botmanager-0.2.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-botmanager
-Version: 0.2.22
+Version: 0.2.23
 Summary: Async tasks for django
 Home-page: https://github.com/dimoha/django-botmanager
 Author: Dimoha

{django_botmanager-0.2.22.dist-info → django_botmanager-0.2.23.dist-info}/RECORD

@@ -7,7 +7,7 @@ botmanager/settings.py,sha256=saOAublzj8ikIwZ7eJR_P90nKolAv29Kp36QDUYEbbw,3266
 botmanager/utils.py,sha256=4epNJDf5C7MrNQlZ8t2EAKGsFGRc2uXqoY49__YHGjg,1105
 botmanager/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 botmanager/management/commands/__init__.py,sha256=uLLxNF6CEdNFFvWTcPHlaYxKQLscMRHs9sRegH19L2g,542
-botmanager/management/commands/bot_manager.py,sha256=0443GJ-74DhXTKUDYNY2YL0FQsQChcdk6J0EI8GIoFw,18210
+botmanager/management/commands/bot_manager.py,sha256=WUybgNhLKOkq40LhMZSjMkWDGI8bMPTS6qBmsya6YNo,19749
 botmanager/migrations/0001_initial.py,sha256=AfYbVMcP171RefENIDUpPkVYQK3xoSxxc_XAr5DIoQs,3357
 botmanager/migrations/0002_auto_20161208_1406.py,sha256=jxfewdTeJ8RpLl-lzxp1zYtJijVPYR54pPXysJeb62U,742
 botmanager/migrations/0003_auto_20161208_1529.py,sha256=FMu3GdUsKqR8oPUPxqsqPfRBjVn-9p_wukgHjsFf5hk,1935
@@ -21,8 +21,8 @@ botmanager/migrations/0010_auto_20170531_1321.py,sha256=VnfOWMBI_fuBGmH1NOuXzA5k
 botmanager/migrations/0011_alter_task_create_dt_alter_task_id.py,sha256=-bR0dQFj_ncNKJLQSVF_aDLIYNkNzkbFcsyWF6vMB2w,706
 botmanager/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 botmanager/templates/botmanager/task/change_form.html,sha256=kwcZ72z_YgNJgWOKNE_jS1WXk7YDvo50r0kdLBXLhmU,277
-django_botmanager-0.2.22.dist-info/licenses/LICENSE,sha256=drrREcwMWVwKpmlpyKh6ytsBFonOm2GbADAJD3WzjKY,1479
-django_botmanager-0.2.22.dist-info/METADATA,sha256=PUXCRGRXCK5PDzO6ygyw8BDp3wx6cThKVU1jVKXliD0,439
-django_botmanager-0.2.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_botmanager-0.2.22.dist-info/top_level.txt,sha256=gq7opmRFT7PQifLHi-_hCCtsMjAAiH87radGZ13utgM,11
-django_botmanager-0.2.22.dist-info/RECORD,,
+django_botmanager-0.2.23.dist-info/licenses/LICENSE,sha256=drrREcwMWVwKpmlpyKh6ytsBFonOm2GbADAJD3WzjKY,1479
+django_botmanager-0.2.23.dist-info/METADATA,sha256=WBTwZp7r9xc17EZTBuYdYnFyPsCtrnKzwzIVtk7It3E,439
+django_botmanager-0.2.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_botmanager-0.2.23.dist-info/top_level.txt,sha256=gq7opmRFT7PQifLHi-_hCCtsMjAAiH87radGZ13utgM,11
+django_botmanager-0.2.23.dist-info/RECORD,,