Kill the entire process group if applicable

sanic-org · Dec 16, 2024 · 515198b · 515198b
1 parent 0cc7076
commit 515198b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/sanic/worker/manager.py b/sanic/worker/manager.py
@@ -372,7 +372,10 @@ def kill(self):
         for process in self.processes:
             logger.info("Killing %s [%s]", process.name, process.pid)
             with suppress(ProcessLookupError):
-                os.kill(process.pid, SIGKILL)
+                try:
+                    os.killpg(os.getpgid(process.pid), SIGKILL)
+                except OSError:
+                    os.kill(process.pid, SIGKILL)
         raise ServerKilled
 
     def shutdown_signal(self, signal, frame):
@@ -381,6 +384,7 @@ def shutdown_signal(self, signal, frame):
             logger.info("Shutdown interrupted. Killing.")
             with suppress(ServerKilled):
                 self.kill()
+            return
 
         logger.info("Received signal %s. Shutting down.", Signals(signal).name)
         self.monitor_publisher.send(None)