Merge pull request #226 abhishekkekane/bug/138

Make websockify respond to SIGTERM
novnc · Feb 18, 2016 · 4e6938e · 4e6938e
2 parents 0b906a1 + 68b1587
commit 4e6938e
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/websockify/websocket.py b/websockify/websocket.py
@@ -1079,6 +1079,14 @@ def start_server(self):
 
                     except (self.Terminate, SystemExit, KeyboardInterrupt):
                         self.msg("In exit")
+                        # terminate all child processes
+                        if multiprocessing and not self.run_once:
+                            children = multiprocessing.active_children()
+
+                            for child in children:
+                                self.msg("Terminating child %s" % child.pid)
+                                child.terminate()
+
                         break
                     except Exception:
                         exc = sys.exc_info()[1]