Merge pull request #34 from voila-gallery/server-shutdown

Add kernel culling and server shutdown timeouts

tljh-voila-gallery/tljh_voila_gallery/__init__.py

@@ -34,9 +34,11 @@ def options_form(spawner):
         return jinja2.Template(f.read()).render(examples=gallery['examples'])
 
 class GallerySpawner(DockerSpawner):
-    # FIXME: What to do about idle culling?!
     cmd = 'jupyter-notebook'
 
+    # rm containers when they stop
+    remove = True
+
     events = False
 
     def get_args(self):
@@ -45,7 +47,12 @@ def get_args(self):
             '--port=%i' % self.port,
             '--NotebookApp.base_url=%s' % self.server.base_url,
             '--NotebookApp.token=%s' % self.user_options['token'],
-            '--NotebookApp.trust_xheaders=True',
+            '--NotebookApp.tornado_settings.trust_xheaders=True',
+            # stop idle servers
+            '--NotebookApp.shutdown_no_activity_timeout=600',
+            '--MappingKernelManager.cull_idle_timeout=600',
+            '--MappingKernelManager.cull_interval=60',
+            '--MappingKernelManager.cull_connected=True',
         ]
         return args + self.args
 
@@ -75,9 +82,6 @@ def tljh_custom_jupyterhub_config(c):
     # Don't kill servers when hub restarts
     c.JupyterHub.cleanup_servers = False
 
-    # rm containers when they stop
-    c.DockerSpawner.remove = True
-
     c.JupyterHub.services = [{
         'name': 'gallery',
         'admin': True,