From ee1a86d192435dc652c4237f11be2e497abcbb45 Mon Sep 17 00:00:00 2001 From: Min RK Date: Thu, 5 Apr 2018 11:05:53 +0200 Subject: [PATCH] progress url is at server/progress instead of server-progress --- jupyterhub/apihandlers/users.py | 4 ++-- jupyterhub/handlers/base.py | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jupyterhub/apihandlers/users.py b/jupyterhub/apihandlers/users.py index 069f02ad..7da87562 100644 --- a/jupyterhub/apihandlers/users.py +++ b/jupyterhub/apihandlers/users.py @@ -372,9 +372,9 @@ default_handlers = [ (r"/api/user", SelfAPIHandler), (r"/api/users", UserListAPIHandler), (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/progress", SpawnProgressAPIHandler), (r"/api/users/([^/]+)/servers/([^/]*)", UserServerAPIHandler), + (r"/api/users/([^/]+)/servers/([^/]*)/progress", SpawnProgressAPIHandler), (r"/api/users/([^/]+)/admin-access", UserAdminAccessAPIHandler), ] diff --git a/jupyterhub/handlers/base.py b/jupyterhub/handlers/base.py index 7e61fc65..769f504c 100644 --- a/jupyterhub/handlers/base.py +++ b/jupyterhub/handlers/base.py @@ -887,10 +887,12 @@ class UserSpawnHandler(BaseHandler): pass # we may have waited above, check pending again: - progress_url = url_path_join( - self.hub.base_url, 'api/users', - user.escaped_name, 'server-progress', spawner.name, - ) + url_parts = [self.hub.base_url, 'api/users', user.escaped_name] + if 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: self.log.info("%s is pending %s", spawner._log_name, spawner.pending)