diff options
| author |   Agustin Henze <tin@sluc.org.ar> | 2014-06-13 21:51:04 -0300 |
|---|---|---|
| committer | Agustin Henze <tin@sluc.org.ar> | 2014-06-13 21:51:04 -0300 |
| commit | 3dddbd8cc879402c2047919bccd20e6697082657 (patch) | |
| tree | 38d6290f37be1d67d91c46027974e6ee3372e232 /nikola/plugins/command/serve.py | |
| parent | 7ac2cf148f7a8ea0de126fed3360b49964ce9b45 (diff) | |
| parent | 58c4878526dec5510f23c812274686787d8724ba (diff) | |
Merge tag 'upstream/7.0.1'
Upstream version 7.0.1
Diffstat (limited to 'nikola/plugins/command/serve.py')
| -rw-r--r-- | nikola/plugins/command/serve.py | 6 |
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): |