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

Make shutdown_socket optional

Browse Source
This commit is contained in:
Unrud
2020-08-31 13:54:47 +02:00
parent cd3fe3e73c
commit 46c39b28d6
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
radicale/server.py
View File

@@ -200,8 +200,16 @@ class RequestHandler(wsgiref.simple_server.WSGIRequestHandler):
handler.run(self.server.get_app()) handler.run(self.server.get_app())
def serve(configuration, shutdown_socket): def serve(configuration, shutdown_socket=None):
"""Serve radicale from configuration.""" """Serve radicale from configuration.
`shutdown_socket` can be used to gracefully shutdown the server.
The socket can be created with `socket.socketpair()`, when the other socket
gets closed the server stops accepting new requests by clients and the
function returns after all active requests are finished.
"""
logger.info("Starting Radicale") logger.info("Starting Radicale")
# Copy configuration before modifying # Copy configuration before modifying
configuration = configuration.copy() configuration = configuration.copy()
@@ -270,7 +278,8 @@ def serve(configuration, shutdown_socket):
if max_connections <= 0 or len(rlist) < max_connections: if max_connections <= 0 or len(rlist) < max_connections:
rlist.extend(servers) rlist.extend(servers)
# Use socket to get notified of program shutdown # Use socket to get notified of program shutdown
rlist.append(shutdown_socket) if shutdown_socket is not None:
rlist.append(shutdown_socket)
rlist, _, _ = select.select(rlist, [], [], select_timeout) rlist, _, _ = select.select(rlist, [], [], select_timeout)
rlist = set(rlist) rlist = set(rlist)
if shutdown_socket in rlist: if shutdown_socket in rlist: