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

add a dict to save spawner's instances, fix user.server with server

Browse Source
This commit is contained in:
Christian Barra
2017-04-19 03:25:26 +02:00
parent ced8e9f874
commit 2aaf82412d
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jupyterhub/user.py
View File

@@ -166,9 +166,9 @@ class User(HasTraits):
@property
def proxy_path(self):
if self.settings.get('subdomain_host'):
return url_path_join('/' + self.domain, self.server_base_url)
return url_path_join('/' + self.domain, self.base_url)
else:
return self.server_base_url
return self.base_url
@property
def domain(self):
@@ -235,12 +235,11 @@ class User(HasTraits):
api_token = self.new_api_token()
db.commit()
self.server_base_url = base_url
# here you create the instance
spawner = self.spawner
# Passing server_name and base_url to the spawner
spawner.server_base_url = base_url
spawner.server_name = server_name
spawner.save_spawner(server_name)
spawner.server = server
spawner.user_options = options or {}
# we are starting a new server, make sure it doesn't restore state
spawner.clear_state()