hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-18 15:33:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

add cleanup_proxy and cleanup_servers config

Browse Source 
allows selective shutdown of just the Hub
without needing to shutdown with different signals.
This commit is contained in:
Min RK
2015-02-27 13:43:15 -08:00
parent 7486f1f20d
commit daeb650228
1 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
jupyterhub/app.py
View File

@@ -348,6 +348,29 @@ class JupyterHub(Application):
)
tornado_settings = Dict(config=True)
cleanup_servers = Bool(True, config=True,
help="""Whether to shutdown single-user servers when the Hub shuts down.
Disable if you want to be able to teardown the Hub while leaving the single-user servers running.
The Hub should be able to resume from database state.
"""
)
cleanup_proxy = Bool(True, config=True,
help="""Whether to shutdown single-user servers when the Hub shuts down.
Disable if you want to be able to teardown the Hub while leaving the proxy running.
Only valid if the proxy was starting by the Hub process.
If both this and cleanup_servers are False, sending SIGINT to the Hub will
only shutdown the Hub, leaving everything else running.
The Hub should be able to resume from database state.
"""
)
handlers = List()
_log_formatter_cls = LogFormatter
@@ -823,15 +846,16 @@ class JupyterHub(Application):
@gen.coroutine
def cleanup(self):
"""Shutdown our various subprocesses and cleanup runtime files."""
self.log.info("Cleaning up single-user servers...")
# request (async) process termination
futures = []
for user in self.db.query(orm.User):
if user.spawner is not None:
futures.append(user.stop())
if self.cleanup_servers:
self.log.info("Cleaning up single-user servers...")
# request (async) process termination
for user in self.db.query(orm.User):
if user.spawner is not None:
futures.append(user.stop())
# clean up proxy while SUS are shutting down
if self.proxy_process and self.proxy_process.poll() is None:
if self.cleanup_proxy and self.proxy_process and self.proxy_process.poll() is None:
self.log.info("Cleaning up proxy[%i]...", self.proxy_process.pid)
try:
self.proxy_process.terminate()