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

Merge pull request #1025 from barrachri/correct_named_servers

Browse Source 
correct self.allow_multiple_servers to self.allow_named_servers
This commit is contained in:
Carol Willing
2017-03-16 18:30:17 -07:00
committed by GitHub
parent be1af58147 bfe1457897
commit 6078b8d9e5
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jupyterhub/user.py
View File

@@ -118,7 +118,7 @@ class User(HasTraits):
hub = self.db.query(orm.Hub).first()
self.allow_multiple_servers = self.settings.get('allow_multiple_servers', False)
self.allow_named_servers = self.settings.get('allow_named_servers', False)
self.cookie_name = '%s-%s' % (hub.server.cookie_name, quote(self.name, safe=''))
self.base_url = url_path_join(
@@ -202,7 +202,7 @@ class User(HasTraits):
def spawn(self, options=None):
"""Start the user's spawner
depending from the value of JupyterHub.allow_multiple_servers
depending from the value of JupyterHub.allow_named_servers
if False:
JupyterHub expects only one single-server per user
@@ -214,7 +214,7 @@ class User(HasTraits):
"""
db = self.db
if self.allow_multiple_servers:
if self.allow_named_servers:
if options is not None and 'server_name' in options:
server_name = options['server_name']
else:
@@ -224,8 +224,6 @@ class User(HasTraits):
server_name = ''
base_url = self.base_url
server = orm.Server(
name = server_name,
cookie_name=self.cookie_name,