Merge pull request #19 from dabapps/no-multiprocessing

Revert "Use multiprocessing to run tasks in child processes"

Author: Pete Wildsmith

django_dbq/management/commands/worker.py

@@ -6,7 +6,6 @@
 from simplesignals.process import WorkerProcessBase
 from time import sleep
 import logging
-import multiprocessing
 
 
 logger = logging.getLogger(__name__)
@@ -15,8 +14,18 @@
 DEFAULT_QUEUE_NAME = 'default'
 
 
-def run_next_task(job):
-    """Updates a job by running its next task"""
+def process_job(queue_name):
+    """This function grabs the next available job for a given queue, and runs its next task."""
+
+    with transaction.atomic():
+        job = Job.objects.get_ready_or_none(queue_name)
+        if not job:
+            return
+
+        logger.info('Processing job: name="%s" queue="%s" id=%s state=%s next_task=%s', job.name, queue_name, job.pk, job.state, job.next_task)
+        job.state = Job.STATES.PROCESSING
+        job.save()
+
     try:
         task_function = import_by_path(job.next_task)
         task_function(job)
@@ -46,23 +55,6 @@ def run_next_task(job):
         raise
 
 
-def process_job(queue_name):
-    """This function grabs the next available job for a given queue, and runs its next task."""
-
-    with transaction.atomic():
-        job = Job.objects.get_ready_or_none(queue_name)
-        if not job:
-            return
-
-        logger.info('Processing job: name="%s" queue="%s" id=%s state=%s next_task=%s', job.name, queue_name, job.pk, job.state, job.next_task)
-        job.state = Job.STATES.PROCESSING
-        job.save()
-
-    child = multiprocessing.Process(target=run_next_task, args=(job,))
-    child.start()
-    child.join()
-
-
 class Worker(WorkerProcessBase):
 
     process_title = "jobworker"