From 53f1f1989ecf3d3086242831c74faa3801026f37 Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Mon, 21 Oct 2013 16:50:52 -0400 Subject: [PATCH] Handle SIGCHLD properly for multiprocessing This commit should fix #101 by enabling a special SIGCHLD handler for when multiprocessing is in use. The handler simply calls `multiprocessing.active_children()` (which in turn calls `_cleanup()`) upon receiving a SIGCHLD. Now, the `fallback_SIGCHLD` is only called when `multiprocessing` is not in use. See also #95. --- websockify/websocket.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/websockify/websocket.py b/websockify/websocket.py index 2548fb8..c40e638 100644 --- a/websockify/websocket.py +++ b/websockify/websocket.py @@ -696,6 +696,9 @@ Sec-WebSocket-Accept: %s\r def terminate(self): raise self.Terminate() + def multiprocessing_SIGCHLD(self, sig, stack): + self.vmsg('Reaing zombies, active child count is %s', len(multiprocessing.active_children())) + def fallback_SIGCHLD(self, sig, stack): # Reap zombies when using os.fork() (python 2.4) self.vmsg("Got SIGCHLD, reaping zombies") @@ -796,7 +799,13 @@ Sec-WebSocket-Accept: %s\r } signal.signal(signal.SIGINT, self.do_SIGINT) signal.signal(signal.SIGTERM, self.do_SIGTERM) - signal.signal(signal.SIGCHLD, self.fallback_SIGCHLD) + if not multiprocessing: + # os.fork() (python 2.4) child reaper + signal.signal(signal.SIGCHLD, self.fallback_SIGCHLD) + else: + # make sure that _cleanup is called when children die + # by calling active_children on SIGCHLD + signal.signal(signal.SIGCHLD, self.multiprocessing_SIGCHLD) last_active_time = self.launch_time try: