Merge commit 'ab389d4e7114d7ddbfd085591d336ea5cc06c00d'

* commit 'ab389d4e7114d7ddbfd085591d336ea5cc06c00d': Collect zombie child processes within server loop
2013-11-27 13:30:30 +01:00
parent 4071291fa9 ab389d4e71
commit ff30e5461f
1 changed files with 2 additions and 1 deletions
@@ -845,7 +845,8 @@ class WebSocketServer(object):
                    pid = err = 0
                    child_count = 0

-                    if multiprocessing and self.idle_timeout:
+                    if multiprocessing:
+                        # Collect zombie child processes
                        child_count = len(multiprocessing.active_children())

                    time_elapsed = time.time() - self.launch_time