From a6e62f4674dde9895031b7b078fc97e2449dc4ab Mon Sep 17 00:00:00 2001
From: Smittix <jamessmith1@outlook.com>
Date: Sat, 28 Feb 2026 17:48:32 +0000
Subject: [PATCH] fix: skip custom signal handlers when running under gunicorn

The custom SIGINT/SIGTERM handler in utils/process.py overrode
gunicorn's own signal management, causing KeyboardInterrupt to fire
inside the gevent worker on Ctrl+C instead of allowing gunicorn's
graceful shutdown. Now detects if another signal manager (gunicorn)
has already installed handlers and defers to it.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 utils/process.py | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/utils/process.py b/utils/process.py
index 3c9c001..3df7d68 100644
--- a/utils/process.py
+++ b/utils/process.py
@@ -104,13 +104,29 @@ def _signal_handler(signum, frame):
     sys.exit(0)
 
 
-# Only register signal handlers if we're not in a thread
-try:
-    signal.signal(signal.SIGTERM, _signal_handler)
-    signal.signal(signal.SIGINT, _signal_handler)
-except ValueError:
-    # Can't set signal handlers from a thread
-    pass
+# Only register signal handlers when running standalone (not under gunicorn).
+# Gunicorn manages its own SIGINT/SIGTERM handling for graceful shutdown;
+# overriding those signals causes KeyboardInterrupt in the wrong context.
+def _is_under_gunicorn():
+    """Check if we're running inside a gunicorn worker."""
+    try:
+        import gunicorn.arbiter  # noqa: F401
+        # If gunicorn is importable AND we were invoked via gunicorn, the
+        # arbiter will have installed its own signal handlers already.
+        # Check the current SIGTERM handler — if it's not the default,
+        # gunicorn (or another manager) owns signals.
+        current = signal.getsignal(signal.SIGTERM)
+        return current not in (signal.SIG_DFL, signal.SIG_IGN, None)
+    except ImportError:
+        return False
+
+if not _is_under_gunicorn():
+    try:
+        signal.signal(signal.SIGTERM, _signal_handler)
+        signal.signal(signal.SIGINT, _signal_handler)
+    except ValueError:
+        # Can't set signal handlers from a thread
+        pass
 
 
 def cleanup_stale_processes() -> None: