joshua
/
websockify
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #219 from noah8713/master 

Remove logging in signal handlers
This commit is contained in:
Solly Ross 2016-01-11 16:28:02 -05:00
parent 8a13c48428 6f0e06772a
commit 0b906a1c3e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
websockify/websocket.py
View File

@ -895,11 +895,14 @@ class WebSocketServer(object):
raise self.Terminate() raise self.Terminate()
def multiprocessing_SIGCHLD(self, sig, stack): def multiprocessing_SIGCHLD(self, sig, stack):
self.vmsg('Reaping zombies, active child count is %s', len(multiprocessing.active_children())) # TODO: figure out a way to actually log this information without
# calling `log` in the signal handlers
multiprocessing.active_children()
def fallback_SIGCHLD(self, sig, stack): def fallback_SIGCHLD(self, sig, stack):
# Reap zombies when using os.fork() (python 2.4) # Reap zombies when using os.fork() (python 2.4)
self.vmsg("Got SIGCHLD, reaping zombies") # TODO: figure out a way to actually log this information without
# calling `log` in the signal handlers
try: try:
result = os.waitpid(-1, os.WNOHANG) result = os.waitpid(-1, os.WNOHANG)
while result[0]: while result[0]:
@ -909,11 +912,13 @@ class WebSocketServer(object):
pass pass
def do_SIGINT(self, sig, stack): def do_SIGINT(self, sig, stack):
self.msg("Got SIGINT, exiting") # TODO: figure out a way to actually log this information without
# calling `log` in the signal handlers
self.terminate() self.terminate()
def do_SIGTERM(self, sig, stack): def do_SIGTERM(self, sig, stack):
self.msg("Got SIGTERM, exiting") # TODO: figure out a way to actually log this information without
# calling `log` in the signal handlers
self.terminate() self.terminate()
def top_new_client(self, startsock, address): def top_new_client(self, startsock, address):