tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup and wait for child processes

Browse Source
This commit is contained in:
Unrud 2018-09-08 14:42:20 +02:00 committed by Unrud
parent db8a7302a0
commit 4fb851c80e
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
radicale/server.py
View File

@ -42,7 +42,7 @@ try:
except ImportError: except ImportError:
systemd = None systemd = None
if os.name == "posix": if hasattr(os, "fork"):
ParallelizationMixIn = socketserver.ForkingMixIn ParallelizationMixIn = socketserver.ForkingMixIn
else: else:
ParallelizationMixIn = socketserver.ThreadingMixIn ParallelizationMixIn = socketserver.ThreadingMixIn
@ -75,6 +75,9 @@ else:
class ParallelHTTPServer(ParallelizationMixIn, class ParallelHTTPServer(ParallelizationMixIn,
wsgiref.simple_server.WSGIServer): wsgiref.simple_server.WSGIServer):
# wait for child processes/threads
_block_on_close = True
# These class attributes must be set before creating instance # These class attributes must be set before creating instance
client_timeout = None client_timeout = None
max_connections = None max_connections = None
@ -311,14 +314,21 @@ def serve(configuration, shutdown_socket=None):
# Fallback to busy waiting. (select.select blocks SIGINT on Windows.) # Fallback to busy waiting. (select.select blocks SIGINT on Windows.)
select_timeout = 1.0 select_timeout = 1.0
logger.info("Radicale server ready") logger.info("Radicale server ready")
while True:
rlist, _, xlist = select.select(sockets, [], sockets, select_timeout) with contextlib.ExitStack() as stack:
if xlist: for _, server in servers.items():
raise RuntimeError("unhandled socket error") # close server
if shutdown_socket in rlist: stack.push(server)
logger.info("Stopping Radicale") while True:
break rlist, _, xlist = select.select(
if rlist: sockets, [], sockets, select_timeout)
server = servers.get(rlist[0]) if xlist:
if server: raise RuntimeError("unhandled socket error")
server.handle_request() if shutdown_socket in rlist:
logger.info("Stopping Radicale")
break
if rlist:
server = servers.get(rlist[0])
if server:
server.handle_request()
server.service_actions()