handle ^C when running calypso in the foreground

diff --git a/calypso.py b/calypso.py
index 6f74b6f3c4cebed239ea2a0aca7d0a82a36692bf..113a24c1b29398e8aaf8684e27dcdba74ef6ee2d 100755 (executable)
--- a/calypso.py
+++ b/calypso.py
@@ -134,11 +134,14 @@ if options.import_dest:
         sys.exit(1)
 
 def run_server():
-    # Launch server
-    server_class = calypso.HTTPSServer if options.ssl else calypso.HTTPServer
-    server = server_class(
-        (options.host, options.port), calypso.CollectionHTTPHandler)
-    server.serve_forever(poll_interval=10)
+    try:
+        # Launch server
+        server_class = calypso.HTTPSServer if options.ssl else calypso.HTTPServer
+        server = server_class(
+            (options.host, options.port), calypso.CollectionHTTPHandler)
+        server.serve_forever(poll_interval=10)
+    except KeyboardInterrupt:
+        server.socket.close()
 
 # If foreground execution is requested, just run the server
 if not options.daemon: