oss/Radicale
oss/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-08-04 18:22:26 +00:00
Code Wiki Activity

require python>=3.5.2

Browse source
This commit is contained in:
Unrud 2018-08-16 08:00:02 +02:00
parent 59d10ef9f7
commit a5fa35e785
4 changed files with 23 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

22
radicale/server.py
View file

@ -73,10 +73,6 @@ class HTTPServer(wsgiref.simple_server.WSGIServer):
self.server_close()
raise
if self.client_timeout and sys.version_info < (3, 5, 2):
logger.warning("Using server.timeout with Python < 3.5.2 "
"can cause network connection failures")
def get_request(self):
# Set timeout for client
_socket, address = super().get_request()
@ -249,12 +245,8 @@ def serve(configuration):
if configuration.getboolean("server", "ssl") else "")
# Create a socket pair to notify the select syscall of program shutdown
# This is not available in python < 3.5 on Windows
if hasattr(socket, "socketpair"):
shutdown_program_socket_in, shutdown_program_socket_out = (
socket.socketpair())
else:
shutdown_program_socket_in, shutdown_program_socket_out = None, None
shutdown_program_socket_in, shutdown_program_socket_out = (
socket.socketpair())
# SIGTERM and SIGINT (aka KeyboardInterrupt) should just mark this for
# shutdown
@ -265,18 +257,16 @@ def serve(configuration):
return
logger.info("Stopping Radicale")
shutdown_program = True
if shutdown_program_socket_in:
shutdown_program_socket_in.sendall(b"goodbye")
shutdown_program_socket_in.sendall(b" ")
signal.signal(signal.SIGTERM, shutdown)
signal.signal(signal.SIGINT, shutdown)
# Main loop: wait for requests on any of the servers or program shutdown
sockets = list(servers.keys())
if shutdown_program_socket_out:
# Use socket pair to get notified of program shutdown
sockets.append(shutdown_program_socket_out)
# Use socket pair to get notified of program shutdown
sockets.append(shutdown_program_socket_out)
select_timeout = None
if not shutdown_program_socket_out or os.name == "nt":
if os.name == "nt":
# Fallback to busy waiting. (select.select blocks SIGINT on Windows.)
select_timeout = 1.0
logger.info("Radicale server ready")