Commit Graph

1693 Commits

Author SHA1 Message Date
Min RK
5f1abf4461 check user.running in delete handler
missed a spot in #147
2015-02-19 20:36:02 +01:00
Min RK
d1d9b5763b Merge pull request #149 from minrk/routes.values
fix filter check in Proxy.check_routes
2015-02-11 12:02:26 -08:00
Min RK
7082ea60ee fix filter check in Proxy.check_routes
and test that check_routes works as intended
2015-02-11 11:17:01 -08:00
Min RK
edfb39c74c Merge pull request #148 from minrk/poke-proxy-api
add proxy API
2015-02-08 10:24:42 -08:00
Min RK
9e9c7c4b68 Merge pull request #147 from minrk/failed-spawn
prevent inconsistent state if Spawner.start fails
2015-02-08 10:23:39 -08:00
Min RK
b4980f1736 test inconsistent state if Spawner.start fails 2015-02-08 10:19:48 -08:00
Min RK
c82903b85e add 'pending' to user REST model 2015-02-08 10:19:48 -08:00
Min RK
088893e3dc cleanup HTTP server in JupyterHub.stop
and cleanup MockHub instance in between uses
2015-02-08 10:16:46 -08:00
Min RK
037fb66f2f test externally managed proxy
including stop/restart and new API url
2015-02-08 10:15:28 -08:00
Min RK
4fd58b2bf2 add proxy API
- GET fetches proxy table (relays same request to proxy's API endpoint)
- POST prods routing table sync (useful when proxy restarts)
- PATCH allows updating the proxy API location, auth token
2015-02-06 17:06:41 -08:00
Min RK
0dc3150762 add Proxy.check_routes
checks to ensure proxy table and user db are in sync

called on each last-activity check with the proxy (5 minutes)
2015-02-06 17:06:01 -08:00
Min RK
b5eda9d785 add User.running
as the one true way to check whether a user is running or not

User.running will be True if spawn or stop is pending.
2015-02-06 15:42:57 -08:00
Min RK
1fd139418a cleanup after any exception in spawn
not just timeouts
2015-02-06 14:47:14 -08:00
Min RK
d1c42f960c Merge pull request #145 from minrk/token-aliases
add common config aliases to token subcommand
2015-02-05 21:43:58 -08:00
Min RK
dd01a4ba99 add common config aliases to token subcommand
and load config from the file

allows `jupyterhub token -f configfile.py [user]`
2015-02-05 21:32:48 -08:00
Min RK
df8925a232 revert logo URL change
it just increased the number of redirects
2015-02-02 11:09:51 -08:00
Min RK
2c49bcb703 Merge pull request #144 from ckald/patch-1
Logo links to Hub home instead of user URL
2015-02-02 11:02:25 -08:00
Andrii Magalich
1a26351a8e {{base_url}} points to the user's home here, use {{prefix}} instead 2015-02-02 19:08:30 +01:00
Andrii Magalich
73ec94d3e0 Add "Hub" button to the header
Currently the Jupyter logo link brings us to the users' dashboard and there is no way to get to the initial screen (containing "Stop my server"/"My server"/"Admin" buttons)
2015-02-02 13:59:53 +01:00
Min RK
08f44b7feb Merge pull request #142 from minrk/admin-layout
admin page UI
2015-02-01 14:54:22 -08:00
Min RK
3acf8dd5b9 allow adding unsorted columns to admin via template blocks 2015-01-31 16:57:58 -08:00
Min RK
056cd0c246 show dialog when ajax requests fail 2015-01-31 16:57:57 -08:00
Min RK
e12dde371f set JSON header on JSON error replies 2015-01-31 16:57:57 -08:00
Min RK
98daa5409d don't reload page on server start/stop 2015-01-31 16:57:57 -08:00
Min RK
b99cb61a32 add user, running count to admin page 2015-01-31 16:57:57 -08:00
Min RK
425c870f47 allow sorting admin columns 2015-01-31 16:49:56 -08:00
Min RK
7c7aacef68 move add-user to top 2015-01-31 16:49:08 -08:00
Min RK
f2b818e685 Merge pull request #132 from minrk/admin-access
add JupyterHub.admin_access
2015-01-31 16:48:32 -08:00
Min RK
4e2b79a60f Merge pull request #135 from minrk/slow-stop
handle Spawners that are slow to stop
2015-01-31 16:47:56 -08:00
Min RK
3d57bd03e3 Merge pull request #129 from minrk/travis-container
containerized travis build
2015-01-31 16:47:27 -08:00
Min RK
ab23998f9c Merge pull request #143 from quantopian/non-async-add-user
DEV: Allow Authenticator.add_user to not be a future.
2015-01-30 09:45:57 -08:00
Scott Sanderson
b578e7527d DEV: Allow Authenticator.add_user to not be a future. 2015-01-30 12:30:28 -05:00
Min RK
7051488cc4 don't compute etags
causes inappropriate caching of content
2015-01-29 15:01:32 -08:00
Min RK
e07fb87af8 Merge pull request #140 from minrk/logging
more info in log prefix
2015-01-29 11:46:25 -08:00
Min RK
2a04ac889f Merge pull request #138 from minrk/cache-static
cache control on static files
2015-01-29 11:46:07 -08:00
Min RK
e9c20c3f00 more info in log prefix
- include date, in addition to time
- show module:line
- put username in single-user log prefix

It's more information, making the log prefix pretty long now, but I think it makes sense,
given the number of log sources and likely duration of a JupyterHub instance.
2015-01-28 14:47:42 -08:00
Min RK
7753428dd7 cache control on static files
same principle as used in IPython,
slightly different implementation.
2015-01-28 14:21:43 -08:00
Min RK
09d9efb44c handle Spawners that are slow to stop
e.g. docker, which can take a long time to stop,
especially if several docker actions are already queued.

Use status `202: Accepted` for API replies sent with spawn/stop still pending
2015-01-28 11:35:38 -08:00
Min RK
dee8d4af00 Merge pull request #134 from minrk/xheaders
turn on xheaders
2015-01-28 10:39:18 -08:00
Min RK
c608e4a915 turn on xheaders
logs real IP, rather than proxy IP
2015-01-28 09:56:23 -08:00
Min RK
6b9f73ba1f add JupyterHub.admin_access
optionally allow admin users to login to user servers by visiting a special admin-only URL that sets the relevant cookie

- disabled by default
- an 'access server' button is added to the admin panel, which sets the necessary cookie to log in to the user server
2015-01-27 17:04:30 -08:00
Min RK
6dc65d55a5 split cookie setting into sub-methods
so they can be reused
2015-01-27 16:32:15 -08:00
Min RK
353c70e8b0 Merge pull request #130 from YannBrrd/patch-1
Update wiki reference
2015-01-17 11:55:54 -08:00
Yann Barraud
23b72896b1 Update wiki reference 2015-01-17 12:00:48 +01:00
Min RK
8b2812456f containerized travis build 2015-01-16 16:47:02 -08:00
Min RK
3974be8aa0 Merge pull request #128 from minrk/authdb
give Spawners, Authenticators db access
2015-01-16 16:42:35 -08:00
Min RK
8cd2a55aa8 give Spawners, Authenticators db access
as self.db
2015-01-16 16:38:30 -08:00
Min RK
c4eb233631 Merge pull request #126 from quantopian/default-login-on-auth
DEV: Make login a base-class default on Authenticator.get_handlers.

closes #125
2015-01-14 15:04:23 -08:00
Scott Sanderson
4c5de826c4 DEV: Make login a base-class default on Authenticator.get_handlers.
Rather than a module-level default.  Makes it easier for custom
Authenticators to unmount /login.
2015-01-14 17:40:57 -05:00
Min RK
63a06c6ae0 Merge pull request #124 from minrk/add-user-coroutine
allow some auth methods to be async
2015-01-12 16:33:03 -08:00