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

DEV: Make the timeout used by wait_for_http_server configurable.

Browse Source
This commit is contained in:
Scott Sanderson
2015-03-04 23:37:30 -05:00
parent f741240634
commit 0c3bce8b57
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jupyterhub/orm.py
View File

@@ -367,12 +367,17 @@ class User(Base):
self.last_activity = datetime.utcnow()
db.commit()
try:
yield self.server.wait_up(http=True)
yield self.server.wait_up(http=True, timeout=spawner.http_timeout)
except Exception as e:
if isinstance(e, TimeoutError):
self.log.warn("{user}'s server never showed up at {url}, giving up".format(
user=self.name, url=self.server.url,
))
self.log.warn(
"{user}'s server never showed up at {url} "
"after {http_timeout} seconds. Giving up".format(
user=self.name,
url=self.server.url,
http_timeout=spawner.http_timeout,
)
)
else:
self.log.error("Unhandled error waiting for {user}'s server to show up at {url}: {error}".format(
user=self.name, url=self.server.url, error=e,