Skip to content
Permalink
Browse files

fix #1811

  • Loading branch information
ralsina committed Jun 11, 2015
1 parent f1e95ef commit a9e09414cdb14128137ac8353ccfa1bfda2c4cf4
Showing with 4 additions and 2 deletions.
  1. +1 −0 CHANGES.txt
  2. +3 −2 nikola/plugins/command/auto/__init__.py
@@ -12,6 +12,7 @@ Features
Bugfixes
--------

* Make auto shutdown with ctrl-c (Issue #1811)
* Log properly in ``nikola auto`` (Issue #1812)
* Handle rare gettz failure (Issue #1806)
* Handle missing dependencies better in auto plugin (Issues #1803, #1809)
@@ -128,7 +128,6 @@ def _execute(self, options, args):
if self.site.configuration_filename != 'conf.py':
self.cmd_arguments = ['--conf=' + self.site.configuration_filename] + self.cmd_arguments


# Run an initial build so we are up-to-date
subprocess.call(["nikola"] + self.cmd_arguments)

@@ -210,7 +209,9 @@ def __call__(self, environ, start_response):
ws.serve_forever()
except KeyboardInterrupt:
self.logger.info("Server is shutting down.")
exit(130)
# This is a hack, but something is locking up in a futex
# and exit() doesn't work.
os.kill(os.getpid(), 15)

def do_rebuild(self, event):
p = subprocess.Popen(self.cmd_arguments, stderr=subprocess.PIPE)

0 comments on commit a9e0941

Please sign in to comment.
You can’t perform that action at this time.