New version: Enabled logging exception and status of task before and after sending to the dqm socket, added continue in main worker while loop in order to continue on exception

Author: rtu-dataframe

django-queue-manager/build/lib/django_queue_manager/models.py

@@ -30,9 +30,8 @@ class QueuedTasks(models.Model):
     dqmqueue = models.ForeignKey(DQMQueue, on_delete=models.CASCADE)
 
     def __str__(self):
-        return "Job-Id: {job_id} -> Function Name: {function_name} -> Queued on: {queued_on} -> Queue: {queue}".format(
+        return "Job-Id: {job_id} -> Queued on: {queued_on} -> Queue: {queue}".format(
             job_id=self.pk,
-            function_name=self.task_function_name,
             queued_on=self.queued_on, queue=self.dqmqueue.description)
 
     class Meta:
@@ -50,9 +49,8 @@ class SuccessTasks(models.Model):
     dqmqueue = models.ForeignKey(DQMQueue, on_delete=models.CASCADE)
 
     def __str__(self):
-        return "Job-Id: {job_id} -> Function Name: {function_name} -> Success on: {success_on} -> Queue: {queue}".format(
+        return "Job-Id: {job_id} -> Success on: {success_on} -> Queue: {queue}".format(
             job_id=self.task_id,
-            function_name=self.task_function_name,
             success_on=self.success_on, queue=self.dqmqueue.description)
 
     class Meta:
@@ -71,9 +69,8 @@ class FailedTasks(models.Model):
     dqmqueue = models.ForeignKey(DQMQueue, on_delete=models.CASCADE)
 
     def __str__(self):
-        return "Job-Id: {job_id} -> Function Name: {function_name} -> Failed on: {failed_on} -> Queue: {queue}".format(
+        return "Job-Id: {job_id} -> Failed on: {failed_on} -> Queue: {queue}".format(
             job_id=self.task_id,
-            function_name=self.task_function_name,
             failed_on=self.failed_on, queue=self.dqmqueue.description)
 
     class Meta:

django-queue-manager/build/lib/django_queue_manager/worker.py

@@ -90,21 +90,29 @@ def run(self):
                     # Save it on the failed table
                     TaskManager.save_task_failed(task, e)
 
+
                     self.logger.warning(
                         'Task Id {db_id} failed!'.format(name=task.task_function_name,
                                                               db_id=task.db_id))
                     #Continue the loop if the task throw an exception
                     continue
 
-                # Removes the enqueued task from the DB after execution or failure
-                TaskManager.delete_enqueued_task(task)
-                self.logger.info('Removing Task Id {db_id} from enqueued tasks!'.format(
-                    name=task.task_function_name,
-                    db_id=task.db_id))
+                finally:
+                    #In any case, it will dequeue the task form the queued tasks
+                    self.dequeue_task(task=task)
+
+
 
             else:
                 # In order to respect the CPU sleeps for 50 milliseconds when the queue it's empty
                 time.sleep(0.050)
 
         self.worker_queue = None
         self.logger.warning('Worker Thread stopped, {0} tasks handled'.format(self.tasks_counter))
+
+    def dequeue_task(self, task):
+        # Removes the enqueued task from the DB after execution or failure
+        TaskManager.delete_enqueued_task(task)
+        self.logger.info('Removing Task Id {db_id} from enqueued tasks!'.format(
+            name=task.task_function_name,
+            db_id=task.db_id))

django-queue-manager/dist/django-queue-manager-1.2.5.tar.gz

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: django-queue-manager
-Version: 1.2.4
+Version: 1.2.5
 Summary: A simple app that provides a Message Queue System using a socket as broker, this app, make you able to manage an ordered queue of tasks (with calling a simple queuing function form API).Simple to setup, easy to manage and scalable, the queue can be remotized to another server,you can use multiple istance of the application, and easly manage multiple broker and relatives queues.This app, will integrate into your DB backend and serves three table with the states of the queue.
 Home-page: http://www.fardellasimone.com/
 Author: Fardella Simone

django-queue-manager/dist/django_queue_manager-1.2.5-py2.py3-none-any.whl

@@ -30,9 +30,8 @@ class QueuedTasks(models.Model):
     dqmqueue = models.ForeignKey(DQMQueue, on_delete=models.CASCADE)
 
     def __str__(self):
-        return "Job-Id: {job_id} -> Function Name: {function_name} -> Queued on: {queued_on} -> Queue: {queue}".format(
+        return "Job-Id: {job_id} -> Queued on: {queued_on} -> Queue: {queue}".format(
             job_id=self.pk,
-            function_name=self.task_function_name,
             queued_on=self.queued_on, queue=self.dqmqueue.description)
 
     class Meta:
@@ -50,9 +49,8 @@ class SuccessTasks(models.Model):
     dqmqueue = models.ForeignKey(DQMQueue, on_delete=models.CASCADE)
 
     def __str__(self):
-        return "Job-Id: {job_id} -> Function Name: {function_name} -> Success on: {success_on} -> Queue: {queue}".format(
+        return "Job-Id: {job_id} -> Success on: {success_on} -> Queue: {queue}".format(
             job_id=self.task_id,
-            function_name=self.task_function_name,
             success_on=self.success_on, queue=self.dqmqueue.description)
 
     class Meta:
@@ -71,9 +69,8 @@ class FailedTasks(models.Model):
     dqmqueue = models.ForeignKey(DQMQueue, on_delete=models.CASCADE)
 
     def __str__(self):
-        return "Job-Id: {job_id} -> Function Name: {function_name} -> Failed on: {failed_on} -> Queue: {queue}".format(
+        return "Job-Id: {job_id} -> Failed on: {failed_on} -> Queue: {queue}".format(
             job_id=self.task_id,
-            function_name=self.task_function_name,
             failed_on=self.failed_on, queue=self.dqmqueue.description)
 
     class Meta:

django-queue-manager/django_queue_manager.egg-info/PKG-INFO

@@ -90,21 +90,29 @@ def run(self):
                     # Save it on the failed table
                     TaskManager.save_task_failed(task, e)
 
+
                     self.logger.warning(
                         'Task Id {db_id} failed!'.format(name=task.task_function_name,
                                                               db_id=task.db_id))
                     #Continue the loop if the task throw an exception
                     continue
 
-                # Removes the enqueued task from the DB after execution or failure
-                TaskManager.delete_enqueued_task(task)
-                self.logger.info('Removing Task Id {db_id} from enqueued tasks!'.format(
-                    name=task.task_function_name,
-                    db_id=task.db_id))
+                finally:
+                    #In any case, it will dequeue the task form the queued tasks
+                    self.dequeue_task(task=task)
+
+
 
             else:
                 # In order to respect the CPU sleeps for 50 milliseconds when the queue it's empty
                 time.sleep(0.050)
 
         self.worker_queue = None
         self.logger.warning('Worker Thread stopped, {0} tasks handled'.format(self.tasks_counter))
+
+    def dequeue_task(self, task):
+        # Removes the enqueued task from the DB after execution or failure
+        TaskManager.delete_enqueued_task(task)
+        self.logger.info('Removing Task Id {db_id} from enqueued tasks!'.format(
+            name=task.task_function_name,
+            db_id=task.db_id))

django-queue-manager/django_queue_manager/models.py

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