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

Fix hub_connect_url

Browse Source
This commit is contained in:
Daisuke Taniwaki
2021-02-01 22:29:43 +09:00
parent fc772e1c39
commit 26ccf6fd57
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jupyterhub/spawner.py
View File

@@ -703,7 +703,7 @@ class Spawner(LoggingConfigurable):
@default("hub_connect_url") @default("hub_connect_url")
def _hub_connect_url(self): def _hub_connect_url(self):
return self.hub.api_url return self.hub.connect_url
def load_state(self, state): def load_state(self, state):
"""Restore state of spawner from database. """Restore state of spawner from database.
@@ -783,9 +783,10 @@ class Spawner(LoggingConfigurable):
# Info previously passed on args # Info previously passed on args
env['JUPYTERHUB_USER'] = self.user.name env['JUPYTERHUB_USER'] = self.user.name
env['JUPYTERHUB_SERVER_NAME'] = self.name env['JUPYTERHUB_SERVER_NAME'] = self.name
env['JUPYTERHUB_API_URL'] = self.hub_connect_url hub_api_url = url_path_join(self.hub_connect_url, 'hub', 'api')
env['JUPYTERHUB_API_URL'] = hub_api_url
env['JUPYTERHUB_ACTIVITY_URL'] = url_path_join( env['JUPYTERHUB_ACTIVITY_URL'] = url_path_join(
self.hub_connect_url, hub_api_url,
'users', 'users',
# tolerate mocks defining only user.name # tolerate mocks defining only user.name
getattr(self.user, 'escaped_name', self.user.name), getattr(self.user, 'escaped_name', self.user.name),

2
jupyterhub/tests/test_spawner.py
View File

@@ -418,7 +418,7 @@ async def test_spawner_env(db):
async def test_hub_connect_url(db): async def test_hub_connect_url(db):
spawner = new_spawner(db, hub_connect_url="https://example.com/hub/api") spawner = new_spawner(db, hub_connect_url="https://example.com/")
name = spawner.user.name name = spawner.user.name
env = spawner.get_env() env = spawner.get_env()
assert env["JUPYTERHUB_API_URL"] == "https://example.com/hub/api" assert env["JUPYTERHUB_API_URL"] == "https://example.com/hub/api"