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

move event_loop closing to shutdown_cancel_tasks

Browse Source
This commit is contained in:
Derek Feichtinger
2019-04-16 13:04:11 +02:00
parent 984d6be542
commit f51e6a1ca0
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jupyterhub/app.py
View File

@@ -2173,8 +2173,6 @@ class JupyterHub(Application):
self.log.info("Cleaning up PID file %s", self.pid_file) self.log.info("Cleaning up PID file %s", self.pid_file)
os.remove(self.pid_file) os.remove(self.pid_file)
# finally stop the loop once we are all cleaned up
asyncio.get_event_loop().stop()
self.log.info("...done") self.log.info("...done")
def write_config_file(self): def write_config_file(self):
@@ -2415,7 +2413,7 @@ class JupyterHub(Application):
self.init_signal() self.init_signal()
def init_signal(self): def init_signal(self):
loop = asyncio.get_event_loop() # TODO: should use running loop loop = asyncio.get_event_loop()
for s in (signal.SIGTERM, signal.SIGINT): for s in (signal.SIGTERM, signal.SIGINT):
loop.add_signal_handler( loop.add_signal_handler(
s, lambda s=s: asyncio.ensure_future(self.shutdown_cancel_tasks(s)) s, lambda s=s: asyncio.ensure_future(self.shutdown_cancel_tasks(s))
@@ -2456,6 +2454,7 @@ class JupyterHub(Application):
for t in tasks: for t in tasks:
self.log.debug("Task status: %s", t) self.log.debug("Task status: %s", t)
await self.cleanup() await self.cleanup()
asyncio.get_event_loop().stop()
def stop(self): def stop(self):
if not self.io_loop: if not self.io_loop: