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

move user.proxy_pending to Spawner._proxy_pending

Browse Source
This commit is contained in:
Min RK
2017-07-24 15:22:36 +02:00
parent f7bf2b0ba6
commit 9a555d8a6e
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jupyterhub/handlers/base.py
View File

@@ -330,7 +330,7 @@ class BaseHandler(RequestHandler):
f = user.spawn(server_name, options) f = user.spawn(server_name, options)
spawner = user.spawners[server_name] spawner = user.spawners[server_name]
user.proxy_pending = True spawner._proxy_pending = True
@gen.coroutine @gen.coroutine
def finish_user_spawn(f=None): def finish_user_spawn(f=None):
@@ -352,9 +352,9 @@ class BaseHandler(RequestHandler):
self.log.error("Stopping user %s to avoid inconsistent state") self.log.error("Stopping user %s to avoid inconsistent state")
yield user.stop() yield user.stop()
else: else:
user.spawner.add_poll_callback(self.user_stopped, user) spawner.add_poll_callback(self.user_stopped, user)
finally: finally:
user.proxy_pending = False spawner._proxy_pending = False
try: try:
yield gen.with_timeout(timedelta(seconds=self.slow_spawn_timeout), f) yield gen.with_timeout(timedelta(seconds=self.slow_spawn_timeout), f)

1
jupyterhub/spawner.py
View File

@@ -48,6 +48,7 @@ class Spawner(LoggingConfigurable):
# private attributes for tracking status # private attributes for tracking status
_spawn_pending = False _spawn_pending = False
_stop_pending = False _stop_pending = False
_proxy_pending = False
_waiting_for_response = False _waiting_for_response = False
orm_spawner = Any() orm_spawner = Any()

4
jupyterhub/user.py
View File

@@ -117,10 +117,6 @@ class User(HasTraits):
self._user_id = None self._user_id = None
spawners = None spawners = None
spawn_pending = False
stop_pending = False
proxy_pending = False
waiting_for_response = False
@property @property
def authenticator(self): def authenticator(self):