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

Cosmetic changes

Browse Source
This commit is contained in:
Unrud 2020-02-19 09:50:00 +01:00
parent cc22927353
commit 3b99d64935
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radicale/__main__.py
View File

@ -142,7 +142,7 @@ def run():
# SIGTERM and SIGINT (aka KeyboardInterrupt) shutdown the server # SIGTERM and SIGINT (aka KeyboardInterrupt) shutdown the server
def shutdown(signal_number, stack_frame): def shutdown(signal_number, stack_frame):
shutdown_socket.sendall(b" ") shutdown_socket.close()
signal.signal(signal.SIGTERM, shutdown) signal.signal(signal.SIGTERM, shutdown)
signal.signal(signal.SIGINT, shutdown) signal.signal(signal.SIGINT, shutdown)

6
radicale/server.py
View File

@ -84,7 +84,7 @@ else:
class ParallelHTTPServer(ParallelizationMixIn, class ParallelHTTPServer(ParallelizationMixIn,
wsgiref.simple_server.WSGIServer): wsgiref.simple_server.WSGIServer):
# wait for child processes/threads # Python 3.6: Wait for child processes/threads (Default in Python >= 3.7)
_block_on_close = True _block_on_close = True
def __init__(self, configuration, address_family, def __init__(self, configuration, address_family,
@ -315,9 +315,9 @@ def serve(configuration, shutdown_socket=None):
select_timeout = 1.0 select_timeout = 1.0
logger.info("Radicale server ready") logger.info("Radicale server ready")
with contextlib.ExitStack() as stack: with contextlib.ExitStack() as exit_stack:
for _, server in servers.items(): for _, server in servers.items():
stack.callback(server.server_close) exit_stack.callback(server.server_close)
while True: while True:
rlist, _, xlist = select.select( rlist, _, xlist = select.select(
sockets, [], sockets, select_timeout) sockets, [], sockets, select_timeout)