summaryrefslogtreecommitdiffstats
path: root/nikola/plugins/command/serve.py
diff options
context:
space:
mode:
authorLibravatarAgustin Henze <tin@sluc.org.ar>2014-06-13 21:51:02 -0300
committerLibravatarAgustin Henze <tin@sluc.org.ar>2014-06-13 21:51:02 -0300
commit58c4878526dec5510f23c812274686787d8724ba (patch)
tree5f2374bc17adb10e15f7e5b4576595d9cc2ef17e /nikola/plugins/command/serve.py
parentfa50632a9d87c3989566fed3e49c160a132e0d14 (diff)
Imported Upstream version 7.0.1upstream/7.0.1
Diffstat (limited to 'nikola/plugins/command/serve.py')
-rw-r--r--nikola/plugins/command/serve.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/nikola/plugins/command/serve.py b/nikola/plugins/command/serve.py
index f27d1f7..623e2db 100644
--- a/nikola/plugins/command/serve.py
+++ b/nikola/plugins/command/serve.py
@@ -89,7 +89,11 @@ class CommandServe(Command):
server_url = "http://{0}:{1}/".format(options['address'], options['port'])
self.logger.info("Opening {0} in the default web browser ...".format(server_url))
webbrowser.open(server_url)
- httpd.serve_forever()
+ try:
+ httpd.serve_forever()
+ except KeyboardInterrupt:
+ self.logger.info("Server is shutting down.")
+ exit(130)
class OurHTTPRequestHandler(SimpleHTTPRequestHandler):