- Minor bugfixes

Author: rtu-dataframe

django-queue-manager/django_queue_manager/worker.py

@@ -1,4 +1,5 @@
 #  Based on the Worker class from Python in a nutshell, by Alex Martelli
+import django
 import logging
 import threading
 import queue as Queue
@@ -7,9 +8,11 @@
 import time
 from django_queue_manager.task_manager import TaskManager
 from django.conf import settings
+
 SAVE_SUCCESS_TASKS = getattr(settings, "SAVE_SUCCESS_TASKS", True)
 
 from django_queue_manager.utilities.loggers import get_default_logger
+
 logger = get_default_logger(__name__)
 
 
@@ -74,9 +77,15 @@ def run(self):
         # The code above will run indefinitely except when a thread _stopevent.isSet(), it will try to empty
         # the queue and move the task into success/failed tasks in base of successful or not execution.
         self.logger.info('Worker Thread Starts')
+        django.setup()
         while not self._stopevent.isSet():
+            if not self.worker_queue.empty():
                 try:
                     task = self.worker_queue.get()
+                    if task is None:
+                        break
+
+                    django.db.connection.close()
 
                     self.logger.info('Consuming Task Id: {db_id}'.format(
                         name=task.task_function_name,
@@ -89,9 +98,6 @@ def run(self):
                         self.logger.info(
                             'Task Id {db_id} success!'.format(name=task.task_function_name,
                                                               db_id=task.db_id))
-                except Queue.Empty:
-                    continue
-
                 except Exception as e:
                     # Save it on the failed table
                     TaskManager.save_task_failed(task, e)
@@ -108,11 +114,7 @@ def run(self):
                         # In any case, it will dequeue the task form the queued tasks
                         self.dequeue_task(task=task)
 
-                    self.worker_queue.task_done()
-
-                    # Close the connection, in order to prevent (2006, 'MySQL server has gone away') timeout error
-                    from django.db import connection
-                    connection.close()
+                    django.db.connection.close()
 
         self.worker_queue = None
         self.logger.warning('Worker Thread stopped, {0} tasks handled'.format(self.tasks_counter))

django-queue-manager/setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='django-queue-manager',
-    version='1.3.4',
+    version='1.3.5',
     packages=find_packages(),
     include_package_data=True,
     license='GNU GPLv3',