Refactor server launching

See skyportal#55

Author: bnaul

Dockerfile

@@ -25,17 +25,21 @@ ENV LANG=C.UTF-8
 ADD . /cesium
 WORKDIR /cesium
 
-RUN bash -c "source /cesium_env/bin/activate && \
+RUN bash -c "\
+    source /cesium_env/bin/activate && \
     make paths && \
-    make dependencies && \
+    (make dependencies || make dependencies) && \
+    make bundle && \
+    rm -rf node_modules && \
     chown -R cesium.cesium /cesium_env && \
-    chown -R cesium.cesium /cesium"
+    chown -R cesium.cesium /cesium && \
+    cp docker.yaml config.yaml"
 
 USER cesium
 
 EXPOSE 5000
 
 CMD bash -c "source /cesium_env/bin/activate && \
              (make log &) && \
-             make dockerrun"
+             make run_production"
 

Makefile

@@ -1,11 +1,14 @@
 SHELL = /bin/bash
 SUPERVISORD=FLAGS=$$FLAGS supervisord -c baselayer/conf/supervisor/supervisor.conf
 SUPERVISORCTL=FLAGS=$$FLAGS supervisorctl -c baselayer/conf/supervisor/supervisor.conf
+ENV_SUMMARY=PYTHONPATH=. ./baselayer/tools/env_summary.py $$FLAGS
+ESLINT=./node_modules/.bin/eslint
 
 .DEFAULT_GOAL := run
 
 bundle = ./static/build/bundle.js
 webpack = ./node_modules/.bin/webpack
+baselayer_branch = $(shell git config -f .gitmodules submodule.baselayer.branch)
 
 baselayer/README.md:
 	git submodule update --init --remote
@@ -43,14 +46,32 @@ log: paths
 	./baselayer/tools/watch_logs.py
 
 run: paths dependencies
-	@echo "Supervisor will now fire up various micro-services."
+	@echo "Supervisor will now fire up various services."
 	@echo
-	@echo " - Please run \`make log\` in another terminal to view logs"
-	@echo " - Press Ctrl-C to abort the server"
+	@echo " - Run \`make log\` in another terminal to view logs"
 	@echo " - Run \`make monitor\` in another terminal to restart services"
 	@echo
+	@echo "The server is in debug mode:"
+	@echo "  JavaScript and Python files will be reloaded upon change."
+	@echo
+
+	@FLAGS="--debug" && \
+	$(ENV_SUMMARY) && echo && \
+	echo "Press Ctrl-C to abort the server" && \
+	echo && \
 	$(SUPERVISORD)
 
+run_production:
+	export FLAGS="--config config.yaml" && \
+	$(ENV_SUMMARY) && \
+	$(SUPERVISORD)
+
+run_testing: paths dependencies
+	export FLAGS="--config _test_config.yaml" && \
+	$(ENV_SUMMARY) && \
+	$(SUPERVISORD)
+
+
 monitor:
 	@echo "Entering supervisor control panel."
 	@echo " - Type \`status\` too see microservice status"
@@ -60,11 +81,15 @@ monitor:
 attach:
 	$(SUPERVISORCTL) fg app
 
-testrun: paths dependencies
-	export FLAGS="--config _test_config.yaml" && $(SUPERVISORD)
+run_production:
+	export FLAGS="--config config.yaml" && \
+	$(ENV_SUMMARY) && \
+	$(SUPERVISORD)
 
-dockerrun: paths dependencies
-	export FLAGS="--config docker.yaml" && $(SUPERVISORD)
+run_testing: paths dependencies
+	export FLAGS="--config _test_config.yaml" && \
+	$(ENV_SUMMARY) && \
+	$(SUPERVISORD)
 
 debug:
 	@echo "Starting web service in debug mode"

cesium_app/app_server.py

@@ -7,7 +7,6 @@
 from baselayer.app.config import Config
 from . import models
 from baselayer.app import model_util
-from baselayer.app.config import load_config
 
 # This provides `login`, `complete`, and `disconnect` endpoints
 from social_tornado.routes import SOCIAL_AUTH_ROUTES

cesium_app/model_util.py

@@ -1,6 +1,6 @@
 import textwrap
 
-from baselayer.app.config import load_config
+from baselayer.app.config import load_env
 from baselayer.app.model_util import status, create_tables, drop_tables
 from cesium_app import models
 
@@ -59,7 +59,7 @@ def insert_test_data():
 
 
 if __name__ == "__main__":
-    cfg = load_config()
+    env, cfg = load_env()
 
     with status(f"Connecting to database {cfg['database']['database']}"):
         models.init_db(**cfg['database'])

docker-compose.yaml

@@ -2,6 +2,7 @@ web:
   image: cesium/web
   ports:
     - "9000:5000"
+    - "9001:5001"
   links:
     - db
 

tools/test_frontend.py

@@ -67,14 +67,14 @@ def delete_test_yaml():
 
     # Initialize the test database connection
     from cesium_app.models import init_db
-    from cesium_app.app_server import load_config
+    from baselayer.app.config import load_config
     basedir = pathlib.Path(os.path.dirname(__file__))/'..'
     cfg = load_config([basedir/'config.yaml.example', basedir/TEST_CONFIG])
     init_db(**cfg['database'])
 
     clear_tables()
 
-    web_client = subprocess.Popen(['make', 'testrun'], cwd=base_dir,
+    web_client = subprocess.Popen(['make', 'run_testing'], cwd=base_dir,
                                   preexec_fn=os.setsid)
 
     print('[test_frontend] Waiting for supervisord to launch all server processes...')