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

routespecs are strings (again)

Browse Source 
- no slash means host-routing
- slash means no-host
This commit is contained in:
Min RK
2017-06-23 11:49:46 +02:00
parent 49bf4747fd
commit 11e6c38702
8 changed files with 133 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jupyterhub/user.py
View File

@@ -15,7 +15,6 @@ from . import orm
from .objects import Server
from traitlets import HasTraits, Any, Dict, observe, default
from .spawner import LocalProcessSpawner
from .proxy import RouteSpec
class UserDict(dict):
"""Like defaultdict, but for users
@@ -120,7 +119,7 @@ class User(HasTraits):
self.allow_named_servers = self.settings.get('allow_named_servers', False)
self.base_url = url_path_join(
self.settings.get('base_url', '/'), 'user', self.escaped_name)
self.settings.get('base_url', '/'), 'user', self.escaped_name) + '/'
self.spawner = self.spawner_class(
user=self,
@@ -171,9 +170,9 @@ class User(HasTraits):
@property
def proxy_spec(self):
if self.settings.get('subdomain_host'):
return RouteSpec(path=self.base_url, host=self.domain)
return self.domain + self.base_url
else:
return RouteSpec(path=self.base_url)
return self.base_url
@property
def domain(self):
@@ -223,7 +222,7 @@ class User(HasTraits):
server_name = options['server_name']
else:
server_name = default_server_name(self)
base_url = url_path_join(self.base_url, server_name)
base_url = url_path_join(self.base_url, server_name) + '/'
else:
server_name = ''
base_url = self.base_url