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

fix possible loss of port info due to mixed db sessions

Browse Source
This commit is contained in:
Min RK
2016-01-25 14:28:54 +01:00
parent c4fad21850
commit cc4c65bd0b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jupyterhub/orm.py
View File

@@ -123,7 +123,7 @@ class Server(Base):
if e.errno == errno.ECONNREFUSED: if e.errno == errno.ECONNREFUSED:
return False return False
else: else:
raise raise
else: else:
return True return True
elif e.errno == errno.ECONNREFUSED: elif e.errno == errno.ECONNREFUSED:

3
jupyterhub/user.py
View File

@@ -85,6 +85,7 @@ class User(HasTraits):
if self.orm_user: if self.orm_user:
id = self.orm_user.id id = self.orm_user.id
self.orm_user = new.query(orm.User).filter(orm.User.id==id).first() self.orm_user = new.query(orm.User).filter(orm.User.id==id).first()
self.spawner.db = self.db
orm_user = None orm_user = None
spawner = None spawner = None
@@ -177,6 +178,8 @@ class User(HasTraits):
# wait for spawner.start to return # wait for spawner.start to return
try: try:
f = spawner.start() 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) yield gen.with_timeout(timedelta(seconds=spawner.start_timeout), f)
except Exception as e: except Exception as e:
if isinstance(e, gen.TimeoutError): if isinstance(e, gen.TimeoutError):