From d34ee1217d2569e4c7de5a1e431385fdec13f255 Mon Sep 17 00:00:00 2001 From: Unrud Date: Sun, 30 Jul 2017 11:21:04 +0200 Subject: [PATCH] Revert "Shut down server on SIGINT on Windows" This reverts commit f8de674bd220986e623b0664fecdb1d1f4a77a46. --- radicale/__main__.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/radicale/__main__.py b/radicale/__main__.py index b5542d41..cc9cc495 100644 --- a/radicale/__main__.py +++ b/radicale/__main__.py @@ -256,11 +256,9 @@ def serve(configuration, logger): try: rlist, _, xlist = select.select( sockets, [], sockets, select_timeout) - except select.error: - continue - except KeyboardInterrupt: - shutdown() - continue + except (KeyboardInterrupt, select.error): + # SIGINT is handled by signal handler above + rlist, xlist = [], [] if xlist: raise RuntimeError("unhandled socket error") if rlist: