Remove dependency on simplesignals

Author: j4mie

django_dbq/management/commands/worker.py

@@ -3,9 +3,9 @@
 from django.utils import timezone
 from django.utils.module_loading import import_string
 from django_dbq.models import Job
-from simplesignals.process import WorkerProcessBase
 from time import sleep
 import logging
+import signal
 
 
 logger = logging.getLogger(__name__)
@@ -74,17 +74,27 @@ def process_job(queue_name):
         raise
 
 
-class Worker(WorkerProcessBase):
-
-    process_title = "jobworker"
-
+class Worker:
     def __init__(self, name, rate_limit_in_seconds):
         self.queue_name = name
         self.rate_limit_in_seconds = rate_limit_in_seconds
+        self.alive = True
         self.last_job_finished = None
-        super(Worker, self).__init__()
+        self.init_signals()
+
+    def init_signals(self):
+        signal.signal(signal.SIGINT, self.shutdown)
+        signal.signal(signal.SIGQUIT, self.shutdown)
+        signal.signal(signal.SIGTERM, self.shutdown)
+
+    def shutdown(self):
+        self.alive = False
+
+    def run(self):
+        while self.alive:
+            self.process_job()
 
-    def do_work(self):
+    def process_job(self):
         sleep(1)
         if (
             self.last_job_finished

django_dbq/tests.py

@@ -148,37 +148,37 @@ def test_queue_depth_for_queue_with_zero_jobs(self):
 @freezegun.freeze_time()
 @mock.patch("django_dbq.management.commands.worker.sleep")
 @mock.patch("django_dbq.management.commands.worker.process_job")
-class WorkerProcessDoWorkTestCase(TestCase):
+class WorkerProcessProcessJobTestCase(TestCase):
     def setUp(self):
         super().setUp()
         self.MockWorker = mock.MagicMock()
         self.MockWorker.queue_name = "default"
         self.MockWorker.rate_limit_in_seconds = 5
         self.MockWorker.last_job_finished = None
 
-    def test_do_work_no_previous_job_run(self, mock_process_job, mock_sleep):
-        Worker.do_work(self.MockWorker)
+    def test_process_job_no_previous_job_run(self, mock_process_job, mock_sleep):
+        Worker.process_job(self.MockWorker)
         self.assertEqual(mock_sleep.call_count, 1)
         self.assertEqual(mock_process_job.call_count, 1)
         self.assertEqual(self.MockWorker.last_job_finished, timezone.now())
 
-    def test_do_work_previous_job_too_soon(self, mock_process_job, mock_sleep):
+    def test_process_job_previous_job_too_soon(self, mock_process_job, mock_sleep):
         self.MockWorker.last_job_finished = timezone.now() - timezone.timedelta(
             seconds=2
         )
-        Worker.do_work(self.MockWorker)
+        Worker.process_job(self.MockWorker)
         self.assertEqual(mock_sleep.call_count, 1)
         self.assertEqual(mock_process_job.call_count, 0)
         self.assertEqual(
             self.MockWorker.last_job_finished,
             timezone.now() - timezone.timedelta(seconds=2),
         )
 
-    def test_do_work_previous_job_long_time_ago(self, mock_process_job, mock_sleep):
+    def test_process_job_previous_job_long_time_ago(self, mock_process_job, mock_sleep):
         self.MockWorker.last_job_finished = timezone.now() - timezone.timedelta(
             seconds=7
         )
-        Worker.do_work(self.MockWorker)
+        Worker.process_job(self.MockWorker)
         self.assertEqual(mock_sleep.call_count, 1)
         self.assertEqual(mock_process_job.call_count, 1)
         self.assertEqual(self.MockWorker.last_job_finished, timezone.now())