Merge 0b9f7be into 1d1d0a9

django_q/cluster.py

@@ -1,5 +1,6 @@
 # Standard
 import signal
+import sys
 import socket
 import uuid
 from multiprocessing import Event, Process, Value, current_process
@@ -43,8 +44,14 @@ def __init__(self, broker: Broker = None):
         self.cluster_id = uuid.uuid4()
         self.host = socket.gethostname()
         self.timeout = None
-        signal.signal(signal.SIGTERM, self.sig_handler)
-        signal.signal(signal.SIGINT, self.sig_handler)
+        if sys.platform == "win32":
+            import win32api
+            win32api.SetConsoleCtrlHandler(self.sig_handler_windows, True)
+            signal.signal(signal.SIGINT, signal.SIG_IGN)
+            signal.signal(signal.SIGTERM, signal.SIG_IGN)
+        else:
+            signal.signal(signal.SIGTERM, self.sig_handler)
+            signal.signal(signal.SIGINT, self.sig_handler)
 
     def start(self) -> int:
         if setproctitle:
@@ -90,6 +97,9 @@ def sig_handler(self, signum, frame):
         )
         self.stop()
 
+    def sig_handler_windows(self, signum):
+        self.sig_handler(signum, None)
+
     @property
     def stat(self) -> Status:
         if self.sentinel:

django_q/monitor.py

@@ -1,3 +1,6 @@
+import signal
+import sys
+
 from multiprocessing.process import current_process
 from multiprocessing.queues import Queue
 
@@ -32,6 +35,9 @@ def monitor(result_queue: Queue, broker: Broker = None):
     :type broker: brokers.Broker
     :type result_queue: multiprocessing.Queue
     """
+    if sys.platform == "win32":
+        signal.signal(signal.SIGINT, signal.SIG_IGN)
+        signal.signal(signal.SIGTERM, signal.SIG_IGN)
     if not broker:
         broker = get_broker()
     proc_name = current_process().name

django_q/pusher.py

@@ -1,3 +1,6 @@
+import signal
+import sys
+
 from multiprocessing import Event
 from multiprocessing.process import current_process
 from multiprocessing.queues import Queue
@@ -31,6 +34,11 @@ def pusher(task_queue: Queue, event: Event, broker: Broker = None):
     :type task_queue: multiprocessing.Queue
     :type event: multiprocessing.Event
     """
+
+    if sys.platform == "win32":
+        signal.signal(signal.SIGINT, signal.SIG_IGN)
+        signal.signal(signal.SIGTERM, signal.SIG_IGN)
+
     if not broker:
         broker = get_broker()
     proc_name = current_process().name

django_q/worker.py

@@ -1,3 +1,6 @@
+import signal
+import sys
+
 import pydoc
 import traceback
 from multiprocessing import Value
@@ -42,6 +45,11 @@ def worker(
     :type result_queue: multiprocessing.Queue
     :type timer: multiprocessing.Value
     """
+
+    if sys.platform == "win32":
+        signal.signal(signal.SIGINT, signal.SIG_IGN)
+        signal.signal(signal.SIGTERM, signal.SIG_IGN)
+
     proc_name = current_process().name
     logger.info(
         _("%(proc_name)s ready for work at %(id)s")

pyproject.toml

@@ -66,6 +66,7 @@ django-q-sentry = {version = ">=0.1", optional = true}
 redis = {version = "^4.3.4", optional = true}
 setproctitle = {version = "^1.3.2", optional = true}
 importlib-metadata = {version = ">=3.6", python = "<3.10"}
+pywin32 = { version = ">=306", markers = "python_version >= '3.7' and sys_platform == 'win32'" }
 
 
 [tool.poetry.dev-dependencies]