hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-12 20:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

progress url is at server/progress

Browse Source 
instead of server-progress
This commit is contained in:
Min RK
2018-04-05 11:05:53 +02:00
parent 707b300bd6
commit ee1a86d192
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jupyterhub/apihandlers/users.py
View File

@@ -372,9 +372,9 @@ default_handlers = [
(r"/api/user", SelfAPIHandler), (r"/api/user", SelfAPIHandler),
(r"/api/users", UserListAPIHandler), (r"/api/users", UserListAPIHandler),
(r"/api/users/([^/]+)", UserAPIHandler), (r"/api/users/([^/]+)", UserAPIHandler),
(r"/api/users/([^/]+)/server-progress", SpawnProgressAPIHandler),
(r"/api/users/([^/]+)/server-progress/([^/]*)", SpawnProgressAPIHandler),
(r"/api/users/([^/]+)/server", UserServerAPIHandler), (r"/api/users/([^/]+)/server", UserServerAPIHandler),
(r"/api/users/([^/]+)/server/progress", SpawnProgressAPIHandler),
(r"/api/users/([^/]+)/servers/([^/]*)", UserServerAPIHandler), (r"/api/users/([^/]+)/servers/([^/]*)", UserServerAPIHandler),
(r"/api/users/([^/]+)/servers/([^/]*)/progress", SpawnProgressAPIHandler),
(r"/api/users/([^/]+)/admin-access", UserAdminAccessAPIHandler), (r"/api/users/([^/]+)/admin-access", UserAdminAccessAPIHandler),
] ]

10
jupyterhub/handlers/base.py
View File

@@ -887,10 +887,12 @@ class UserSpawnHandler(BaseHandler):
pass pass
# we may have waited above, check pending again: # we may have waited above, check pending again:
progress_url = url_path_join( url_parts = [self.hub.base_url, 'api/users', user.escaped_name]
self.hub.base_url, 'api/users', if spawner.name:
user.escaped_name, 'server-progress', spawner.name, url_parts.extend(['servers', spawner.name, 'progress'])
) else:
url_parts.extend(['server/progress'])
progress_url = url_path_join(*url_parts)
if spawner.pending: if spawner.pending:
self.log.info("%s is pending %s", spawner._log_name, spawner.pending) self.log.info("%s is pending %s", spawner._log_name, spawner.pending)