Merge pull request #1533 from DerekHeldtWerle/master

If spawner is pending, always route to /hub/home/:user to resolve iss…
This commit is contained in:
Min RK
2017-11-21 19:54:51 +01:00
committed by GitHub

View File

@@ -67,10 +67,11 @@ class HomeHandler(BaseHandler):
if user.running:
# trigger poll_and_notify event in case of a server that died
yield user.spawner.poll_and_notify()
# send the user to /spawn if they aren't running,
# send the user to /spawn if they aren't running or pending a spawn,
# to establish that this is an explicit spawn request rather
# than an implicit one, which can be caused by any link to `/user/:name`
url = user.url if user.running else url_path_join(self.hub.base_url, 'spawn')
url = user.url if user.running or user.spawner.pending else url_path_join(self.hub.base_url, 'spawn')
html = self.render_template('home.html',
user=user,
url=url,
@@ -226,12 +227,12 @@ class TokenPageHandler(BaseHandler):
class ProxyErrorHandler(BaseHandler):
"""Handler for rendering proxy error pages"""
def get(self, status_code_s):
status_code = int(status_code_s)
status_message = responses.get(status_code, 'Unknown HTTP Error')
# build template namespace
hub_home = url_path_join(self.hub.base_url, 'home')
message_html = ''
if status_code == 503: