fix #1832 -- replace hack with proper exit (thanks to watchdog)

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Jun 17, 2015 · 6f3002a · 6f3002a
1 parent 8a69e98
commit 6f3002a
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/nikola/plugins/command/auto/__init__.py b/nikola/plugins/command/auto/__init__.py
@@ -212,9 +212,8 @@ def __call__(self, environ, start_response):
             ws.serve_forever()
         except KeyboardInterrupt:
             self.logger.info("Server is shutting down.")
-            # This is a hack, but something is locking up in a futex
-            # and exit() doesn't work.
-            os.kill(os.getpid(), 15)
+            observer.stop()
+            observer.join()
 
     def do_rebuild(self, event):
         self.logger.info('REBUILDING SITE (from {0})'.format(event.src_path))