websocket: restore signals after processing
WebSocketServer is a library module, as such it should try to restore state after processing, to allow caller to resume normal operation. Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
This commit is contained in:
Alon Bar-Lev
parent
7026e26d68
commit
1190fe1204
|
|
@ -756,112 +756,122 @@ Sec-WebSocket-Accept: %s\r
|
||||||
self.started() # Some things need to happen after daemonizing
|
self.started() # Some things need to happen after daemonizing
|
||||||
|
|
||||||
# Allow override of signals
|
# Allow override of signals
|
||||||
|
original_signals = {
|
||||||
|
signal.SIGINT: signal.getsignal(signal.SIGINT),
|
||||||
|
signal.SIGTERM: signal.getsignal(signal.SIGTERM),
|
||||||
|
signal.SIGCHLD: signal.getsignal(signal.SIGCHLD),
|
||||||
|
}
|
||||||
signal.signal(signal.SIGINT, self.do_SIGINT)
|
signal.signal(signal.SIGINT, self.do_SIGINT)
|
||||||
signal.signal(signal.SIGTERM, self.do_SIGTERM)
|
signal.signal(signal.SIGTERM, self.do_SIGTERM)
|
||||||
signal.signal(signal.SIGCHLD, self.fallback_SIGCHLD)
|
signal.signal(signal.SIGCHLD, self.fallback_SIGCHLD)
|
||||||
|
|
||||||
last_active_time = self.launch_time
|
last_active_time = self.launch_time
|
||||||
while True:
|
try:
|
||||||
try:
|
while True:
|
||||||
try:
|
try:
|
||||||
self.client = None
|
try:
|
||||||
startsock = None
|
self.client = None
|
||||||
pid = err = 0
|
startsock = None
|
||||||
child_count = 0
|
pid = err = 0
|
||||||
|
child_count = 0
|
||||||
|
|
||||||
if multiprocessing:
|
if multiprocessing:
|
||||||
# Collect zombie child processes
|
# Collect zombie child processes
|
||||||
child_count = len(multiprocessing.active_children())
|
child_count = len(multiprocessing.active_children())
|
||||||
|
|
||||||
time_elapsed = time.time() - self.launch_time
|
time_elapsed = time.time() - self.launch_time
|
||||||
if self.timeout and time_elapsed > self.timeout:
|
if self.timeout and time_elapsed > self.timeout:
|
||||||
self.msg('listener exit due to --timeout %s'
|
self.msg('listener exit due to --timeout %s'
|
||||||
% self.timeout)
|
% self.timeout)
|
||||||
break
|
|
||||||
|
|
||||||
if self.idle_timeout:
|
|
||||||
idle_time = 0
|
|
||||||
if child_count == 0:
|
|
||||||
idle_time = time.time() - last_active_time
|
|
||||||
else:
|
|
||||||
idle_time = 0
|
|
||||||
last_active_time = time.time()
|
|
||||||
|
|
||||||
if idle_time > self.idle_timeout and child_count == 0:
|
|
||||||
self.msg('listener exit due to --idle-timeout %s'
|
|
||||||
% self.idle_timeout)
|
|
||||||
break
|
break
|
||||||
|
|
||||||
try:
|
if self.idle_timeout:
|
||||||
self.poll()
|
idle_time = 0
|
||||||
|
if child_count == 0:
|
||||||
|
idle_time = time.time() - last_active_time
|
||||||
|
else:
|
||||||
|
idle_time = 0
|
||||||
|
last_active_time = time.time()
|
||||||
|
|
||||||
ready = select.select([lsock], [], [], 1)[0]
|
if idle_time > self.idle_timeout and child_count == 0:
|
||||||
if lsock in ready:
|
self.msg('listener exit due to --idle-timeout %s'
|
||||||
startsock, address = lsock.accept()
|
% self.idle_timeout)
|
||||||
|
break
|
||||||
|
|
||||||
|
try:
|
||||||
|
self.poll()
|
||||||
|
|
||||||
|
ready = select.select([lsock], [], [], 1)[0]
|
||||||
|
if lsock in ready:
|
||||||
|
startsock, address = lsock.accept()
|
||||||
|
else:
|
||||||
|
continue
|
||||||
|
except Exception:
|
||||||
|
_, exc, _ = sys.exc_info()
|
||||||
|
if hasattr(exc, 'errno'):
|
||||||
|
err = exc.errno
|
||||||
|
elif hasattr(exc, 'args'):
|
||||||
|
err = exc.args[0]
|
||||||
|
else:
|
||||||
|
err = exc[0]
|
||||||
|
if err == errno.EINTR:
|
||||||
|
self.vmsg("Ignoring interrupted syscall")
|
||||||
|
continue
|
||||||
|
else:
|
||||||
|
raise
|
||||||
|
|
||||||
|
if self.run_once:
|
||||||
|
# Run in same process if run_once
|
||||||
|
self.top_new_client(startsock, address)
|
||||||
|
if self.ws_connection :
|
||||||
|
self.msg('%s: exiting due to --run-once'
|
||||||
|
% address[0])
|
||||||
|
break
|
||||||
|
elif multiprocessing:
|
||||||
|
self.vmsg('%s: new handler Process' % address[0])
|
||||||
|
p = multiprocessing.Process(
|
||||||
|
target=self.top_new_client,
|
||||||
|
args=(startsock, address))
|
||||||
|
p.start()
|
||||||
|
# child will not return
|
||||||
else:
|
else:
|
||||||
continue
|
# python 2.4
|
||||||
|
self.vmsg('%s: forking handler' % address[0])
|
||||||
|
pid = os.fork()
|
||||||
|
if pid == 0:
|
||||||
|
# child handler process
|
||||||
|
self.top_new_client(startsock, address)
|
||||||
|
break # child process exits
|
||||||
|
|
||||||
|
# parent process
|
||||||
|
self.handler_id += 1
|
||||||
|
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
_, exc, _ = sys.exc_info()
|
||||||
|
print("In KeyboardInterrupt")
|
||||||
|
pass
|
||||||
|
except SystemExit:
|
||||||
|
_, exc, _ = sys.exc_info()
|
||||||
|
print("In SystemExit")
|
||||||
|
break
|
||||||
except Exception:
|
except Exception:
|
||||||
_, exc, _ = sys.exc_info()
|
_, exc, _ = sys.exc_info()
|
||||||
if hasattr(exc, 'errno'):
|
self.msg("handler exception: %s" % str(exc))
|
||||||
err = exc.errno
|
if self.verbose:
|
||||||
elif hasattr(exc, 'args'):
|
self.msg(traceback.format_exc())
|
||||||
err = exc.args[0]
|
|
||||||
else:
|
|
||||||
err = exc[0]
|
|
||||||
if err == errno.EINTR:
|
|
||||||
self.vmsg("Ignoring interrupted syscall")
|
|
||||||
continue
|
|
||||||
else:
|
|
||||||
raise
|
|
||||||
|
|
||||||
if self.run_once:
|
|
||||||
# Run in same process if run_once
|
|
||||||
self.top_new_client(startsock, address)
|
|
||||||
if self.ws_connection :
|
|
||||||
self.msg('%s: exiting due to --run-once'
|
|
||||||
% address[0])
|
|
||||||
break
|
|
||||||
elif multiprocessing:
|
|
||||||
self.vmsg('%s: new handler Process' % address[0])
|
|
||||||
p = multiprocessing.Process(
|
|
||||||
target=self.top_new_client,
|
|
||||||
args=(startsock, address))
|
|
||||||
p.start()
|
|
||||||
# child will not return
|
|
||||||
else:
|
|
||||||
# python 2.4
|
|
||||||
self.vmsg('%s: forking handler' % address[0])
|
|
||||||
pid = os.fork()
|
|
||||||
if pid == 0:
|
|
||||||
# child handler process
|
|
||||||
self.top_new_client(startsock, address)
|
|
||||||
break # child process exits
|
|
||||||
|
|
||||||
# parent process
|
finally:
|
||||||
self.handler_id += 1
|
if startsock:
|
||||||
|
startsock.close()
|
||||||
|
finally:
|
||||||
|
# Close listen port
|
||||||
|
self.vmsg("Closing socket listening at %s:%s"
|
||||||
|
% (self.listen_host, self.listen_port))
|
||||||
|
lsock.close()
|
||||||
|
|
||||||
except KeyboardInterrupt:
|
# Restore signals
|
||||||
_, exc, _ = sys.exc_info()
|
for sig, func in original_signals.items():
|
||||||
print("In KeyboardInterrupt")
|
signal.signal(sig, func)
|
||||||
pass
|
|
||||||
except SystemExit:
|
|
||||||
_, exc, _ = sys.exc_info()
|
|
||||||
print("In SystemExit")
|
|
||||||
break
|
|
||||||
except Exception:
|
|
||||||
_, exc, _ = sys.exc_info()
|
|
||||||
self.msg("handler exception: %s" % str(exc))
|
|
||||||
if self.verbose:
|
|
||||||
self.msg(traceback.format_exc())
|
|
||||||
|
|
||||||
finally:
|
|
||||||
if startsock:
|
|
||||||
startsock.close()
|
|
||||||
|
|
||||||
# Close listen port
|
|
||||||
self.vmsg("Closing socket listening at %s:%s"
|
|
||||||
% (self.listen_host, self.listen_port))
|
|
||||||
lsock.close()
|
|
||||||
|
|
||||||
|
|
||||||
# HTTP handler with WebSocket upgrade support
|
# HTTP handler with WebSocket upgrade support
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue