Merge pull request #88 from yuvipanda/reload-traefik

Fix traefik config reload
jupyterhub · Jul 31, 2018 · d0f3b58 · d0f3b58
2 parents 41a12a9 + c6654ae
commit d0f3b58
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/tljh/config.py b/tljh/config.py
@@ -11,11 +11,19 @@
 
 tljh-config show firstlevel.second_level
 """
+
+import os
 import sys
 import argparse
 from ruamel.yaml import YAML
 from copy import deepcopy
-from tljh import systemd
+
+
+INSTALL_PREFIX = os.environ.get('TLJH_INSTALL_PREFIX', '/opt/tljh')
+HUB_ENV_PREFIX = os.path.join(INSTALL_PREFIX, 'hub')
+USER_ENV_PREFIX = os.path.join(INSTALL_PREFIX, 'user')
+STATE_DIR = os.path.join(INSTALL_PREFIX, 'state')
+CONFIG_FILE = os.path.join(INSTALL_PREFIX, 'config.yaml')
 
 
 yaml = YAML(typ='rt')
@@ -28,7 +36,7 @@ def set_item_in_config(config, property_path, value):
     config is not mutated.
 
     property_path is a series of dot separated values. Any part of the path
-    that does not exist is created. 
+    that does not exist is created.
     """
     path_components = property_path.split('.')
 
@@ -151,11 +159,14 @@ def reload_component(component):
 
     component can be 'hub' or 'proxy'.
     """
+    # import here to avoid circular imports
+    from tljh import systemd, traefik
     if component == 'hub':
         systemd.restart_service('jupyterhub')
         # FIXME: Verify hub is back up?
         print('Hub reload with new configuration complete')
     elif component == 'proxy':
+        traefik.ensure_traefik_config(STATE_DIR)
         systemd.restart_service('configurable-http-proxy')
         systemd.restart_service('traefik')
         print('Proxy reload with new configuration complete')

diff --git a/tljh/configurer.py b/tljh/configurer.py
@@ -11,8 +11,7 @@
 import os
 import yaml
 
-INSTALL_PREFIX = os.environ.get('TLJH_INSTALL_PREFIX', '/opt/tljh')
-CONFIG_FILE = os.path.join(INSTALL_PREFIX, 'config.yaml')
+from tljh.config import CONFIG_FILE
 
 # Default configuration for tljh
 # User provided config is merged into this

diff --git a/tljh/installer.py b/tljh/installer.py
@@ -11,11 +11,7 @@
 from ruamel.yaml import YAML
 
 from tljh import conda, systemd, traefik, user, apt
-
-INSTALL_PREFIX = os.environ.get('TLJH_INSTALL_PREFIX', '/opt/tljh')
-HUB_ENV_PREFIX = os.path.join(INSTALL_PREFIX, 'hub')
-USER_ENV_PREFIX = os.path.join(INSTALL_PREFIX, 'user')
-STATE_DIR = os.path.join(INSTALL_PREFIX, 'state')
+from tljh.config import INSTALL_PREFIX, HUB_ENV_PREFIX, USER_ENV_PREFIX, STATE_DIR
 
 HERE = os.path.abspath(os.path.dirname(__file__))
 

diff --git a/tljh/jupyterhub_config.py b/tljh/jupyterhub_config.py
@@ -1,14 +1,14 @@
 """
 JupyterHub config for the littlest jupyterhub.
 """
+import copy
 import os
-from systemdspawner import SystemdSpawner
-from tljh import user, configurer
+
 import yaml
-import copy
 
-INSTALL_PREFIX = os.environ.get('TLJH_INSTALL_PREFIX')
-USER_ENV_PREFIX = os.path.join(INSTALL_PREFIX, 'user')
+from systemdspawner import SystemdSpawner
+from tljh import user, configurer
+from tljh.config import INSTALL_PREFIX, USER_ENV_PREFIX
 
 
 class CustomSpawner(SystemdSpawner):