From ee0be96f2cd362f3e7049678740003d216254ffb Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 25 Nov 2014 21:17:49 -0800 Subject: [PATCH] deprecate JupyterHubApp config instead of breaking it outright --- jupyterhub/app.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jupyterhub/app.py b/jupyterhub/app.py index bc2e9aaf..c377aef1 100644 --- a/jupyterhub/app.py +++ b/jupyterhub/app.py @@ -693,11 +693,14 @@ class JupyterHub(Application): self.load_config_file(self.config_file) self.init_logging() if 'JupyterHubApp' in self.config: - self.log.warn("Use JupyterHub in config, not JupyterHubApp. Ignoring config:\n%s", + self.log.warn("Use JupyterHub in config, not JupyterHubApp. Outdated config:\n%s", '\n'.join('JupyterHubApp.{key} = {value!r}'.format(key=key, value=value) for key, value in self.config.JupyterHubApp.items() ) ) + cfg = self.config.copy() + cfg.JupyterHub.merge(cfg.JupyterHubApp) + self.update_config(cfg) self.write_pid_file() self.init_ports() self.init_secrets()