Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure url correctness #783

Merged
merged 2 commits into from
Aug 1, 2018
Merged

Ensure url correctness #783

merged 2 commits into from
Aug 1, 2018

Conversation

chesterli29
Copy link
Contributor

Ensure url correctness in jupyterhub_config.py of cull configuration
using url_path_join. Function url_path_join define in z2jh.py.

Ensure url correctness in jupyterhub_config.py of cull configuration
using url_path_join. Function url_path_join define in z2jh.py.
Copy link
Member

@minrk minrk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Following jupyterhub/jupyterhub#2008 if we require JupyterHub 0.9.1 (what we currently use by default now), then the fix ought to be removing the --url arg altogether, because the kubernetes bug it was a workaround for should no longer be relevant.

@@ -255,7 +255,7 @@ def generate_user_name(spawner):
'--timeout=%s' % cull_timeout,
'--cull-every=%s' % cull_every,
'--concurrency=%s' % cull_concurrency,
'--url=http://127.0.0.1:8081' + c.JupyterHub.base_url + 'hub/api',
'--url=http://127.0.0.1:8081' + url_path_join(c.JupyterHub.base_url, 'hub/api'),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

url_path_join is already defined in jupyterhub.utils, so we can import it from there.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change it, thanks for your review!

Remove url_path_join in z2jh.py, it's already defined in
jupyterhub.utils.
@minrk minrk merged commit fb2cc9b into jupyterhub:master Aug 1, 2018
@consideRatio
Copy link
Member

Wieeee! :D Thank you for the PR @chaoleili and the review @minrk ! ❤️

@choldgraf
Copy link
Member

wooo thanks!

@manics manics mentioned this pull request Aug 15, 2018
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants