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

support named servers in REST API

Browse Source 
and exercise them in tests
This commit is contained in:
Min RK
2017-07-24 16:55:17 +02:00
parent 9a555d8a6e
commit 2cec124b4f
7 changed files with 115 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jupyterhub/handlers/base.py
View File

@@ -400,11 +400,14 @@ class BaseHandler(RequestHandler):
yield user.stop()
@gen.coroutine
def stop_single_user(self, user):
if user.spawner._stop_pending:
raise RuntimeError("Stop already pending for: %s" % user.name)
def stop_single_user(self, user, name=''):
if name not in user.spawners:
raise KeyError("User %s has no such spawner %r", user.name, name)
spawner = user.spawners[name]
if spawner._stop_pending:
raise RuntimeError("Stop already pending for: %s:%s" % (user.name, name))
tic = IOLoop.current().time()
yield self.proxy.delete_user(user)
yield self.proxy.delete_user(user, name)
f = user.stop()
@gen.coroutine
def finish_stop(f=None):
@@ -422,9 +425,9 @@ class BaseHandler(RequestHandler):
try:
yield gen.with_timeout(timedelta(seconds=self.slow_stop_timeout), f)
except gen.TimeoutError:
if user.spawner._stop_pending:
if spawner._stop_pending:
# hit timeout, but stop is still pending
self.log.warning("User %s server is slow to stop", user.name)
self.log.warning("User %s:%s server is slow to stop", user.name, name)
# schedule finish for when the server finishes stopping
IOLoop.current().add_future(f, finish_stop)
else: