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

return (ip, port) from Spawner.start

Browse Source 
removes the need for Spawners to set db state themselves in most cases

Should be backward-compatible with warnings.
This commit is contained in:
Min RK
2016-07-22 14:26:15 +02:00
parent 22ff5f3d91
commit 3159b61ae7
4 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jupyterhub/user.py
View File

@@ -225,7 +225,14 @@ class User(HasTraits):
f = spawner.start()
# commit any changes in spawner.start (always commit db changes before yield)
db.commit()
yield gen.with_timeout(timedelta(seconds=spawner.start_timeout), f)
ip_port = yield gen.with_timeout(timedelta(seconds=spawner.start_timeout), f)
if ip_port:
# get ip, port info from return value of start()
self.server.ip, self.server.port = ip_port
else:
# prior to 0.7, spawners had to store this info in user.server themselves.
# Handle < 0.7 behavior with a warning, assuming info was stored in db by the Spawner.
self.log.warning("DEPRECATION: Spawner.start should return (ip, port) in JupyterHub >= 0.7")
except Exception as e:
if isinstance(e, gen.TimeoutError):
self.log.warning("{user}'s server failed to start in {s} seconds, giving up".format(