Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shutdown kernels on exit and SIGTERM #65

Merged
merged 2 commits into from
Feb 25, 2019
Merged

Shutdown kernels on exit and SIGTERM #65

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f66556d
Shutdown kernels on exit and SIGTERM
jtpio Jan 24, 2019
c321041
small fixes
maartenbreddels Feb 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions voila/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from zmq.eventloop import ioloop
import os
import shutil
import signal
import tempfile
import logging
import gettext
Expand Down Expand Up @@ -131,6 +132,10 @@ def _default_root_dir(self):
else:
return getcwd()

def initialize(self, argv=None):
super(Voila, self).initialize(argv)
signal.signal(signal.SIGTERM, self._handle_signal_stop)

def parse_command_line(self, argv=None):
super(Voila, self).parse_command_line(argv)
self.notebook_path = self.extra_args[0] if len(self.extra_args) == 1 else None
Expand All @@ -150,6 +155,10 @@ def parse_command_line(self, argv=None):
if self.notebook_path and not os.path.exists(self.notebook_path):
raise ValueError('Notebook not found: %s' % self.notebook_path)

def _handle_signal_stop(self, sig, frame):
self.log.info('Handle signal %s.' % sig)
self.ioloop.add_callback_from_signal(self.ioloop.stop)

def start(self):
self.connection_dir = tempfile.mkdtemp(
prefix='voila_',
Expand All @@ -158,7 +167,7 @@ def start(self):
self.log.info('Storing connection files in %s.' % self.connection_dir)
self.log.info('Serving static files from %s.' % self.static_root)

kernel_manager = MappingKernelManager(
self.kernel_manager = MappingKernelManager(
connection_dir=self.connection_dir,
allowed_message_types=[
'comm_msg',
Expand All @@ -180,7 +189,7 @@ def start(self):
self.config_manager = ConfigManager(parent=self, read_config_path=read_config_path)

self.app = tornado.web.Application(
kernel_manager=kernel_manager,
kernel_manager=self.kernel_manager,
allow_remote_access=True,
autoreload=self.autoreload,
voila_jinja2_env=env,
Expand Down Expand Up @@ -245,10 +254,14 @@ def listen(self):
self.app.listen(self.port)
self.log.info('Voila listening on port %s.' % self.port)

self.ioloop = tornado.ioloop.IOLoop.current()
try:
tornado.ioloop.IOLoop.current().start()
self.ioloop.start()
except KeyboardInterrupt:
self.log.info('Stopping...')
finally:
shutil.rmtree(self.connection_dir)
self.kernel_manager.shutdown_all()


main = Voila.launch_instance