Skip to content

Commit

Permalink
Merge pull request #219 from noah8713/master
Browse files Browse the repository at this point in the history
Remove logging in signal handlers
  • Loading branch information
DirectXMan12 committed Jan 11, 2016
2 parents 8a13c48 + 6f0e067 commit 0b906a1
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions websockify/websocket.py
Original file line number Diff line number Diff line change
Expand Up @@ -895,11 +895,14 @@ def terminate(self):
raise self.Terminate()

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):
# 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:
result = os.waitpid(-1, os.WNOHANG)
while result[0]:
Expand All @@ -909,11 +912,13 @@ def fallback_SIGCHLD(self, sig, stack):
pass

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()

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()

def top_new_client(self, startsock, address):
Expand Down

0 comments on commit 0b906a1

Please sign in to comment.