Merge pull request #1383 from deis/fix-check-cmd

fix(confd): simplify check_cmd and fix grep usage

Author: mboersma

controller/bin/boot

@@ -46,28 +46,21 @@ until confd -onetime -node $ETCD -config-file /app/confd.toml 2>/dev/null; do
 	sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
 
-# wait for confd to populate all values
-while grep -q '<no value>' /templates/confd_settings.py; do
-       echo "controller: waiting for confd to write all values..."
-       confd -onetime -node $ETCD -config-file /app/confd.toml 2>/dev/null
-       sleep $(($ETCD_TTL/2))  # sleep for half the TTL
-done
-
 cd /app
 
 # run an idempotent database migration
 sudo -E -u deis ./manage.py syncdb --migrate --noinput
 
-# spawn celery worker in the background
+# spawn celery workers in the background
 sudo -E -u deis celery worker --app=deis --loglevel=INFO --workdir=/app --pidfile=/tmp/celery.pid &
-CELERY_PID=$!
 
-# spawn a gunicorn server in the foreground
+# spawn a gunicorn server in the background
 sudo -E -u deis ./manage.py run_gunicorn -b 0.0.0.0 -w 8 -t 600 -n deis --log-level debug --pid=/tmp/gunicorn.pid --preload &
-GUNICORN_PID=$!
 
 # smart shutdown on SIGINT and SIGTERM
 function on_exit() {
+	CELERY_PID=$(cat /tmp/celery.pid)
+	GUNICORN_PID=$(cat /tmp/gunicorn.pid)
 	kill -TERM $CELERY_PID $GUNICORN_PID
 	wait $CELERY_PID $GUNICORN_PID 2>/dev/null
 	exit 0

controller/bin/check

@@ -3,18 +3,6 @@
 # Check that the configuration for deis-controller is valid.
 #
 
-if [[ -f /templates/confd_settings.py ]] ; then
-    set -e
-
-    # check that "<no value>" isn't in the templated file
-    grep -q -v "<no value>" /templates/confd_settings.py
-
-    THIS_DIR=$(cd $(dirname $0); pwd) # absolute path
-    PARENT_DIR=$(dirname $THIS_DIR)
-
-    # check the Django configuration file compatibility
-    $PARENT_DIR/manage.py check > /dev/null
-
-    # validate the Django models
-    $PARENT_DIR/manage.py validate > /dev/null
+if grep -q "<no value>" $1 ; then
+    exit 1
 fi

controller/bin/reload

@@ -6,4 +6,4 @@ kill -HUP $(cat /tmp/celery.pid)
 # gracefully reload gunicorn
 kill -HUP $(cat /tmp/gunicorn.pid)
 
-exit 0
+exit 0

controller/conf.d/confd_settings.toml

@@ -11,5 +11,5 @@ keys = [
   "/deis/registry",
   "/deis/domains",
 ]
-check_cmd = "/app/bin/check"
+check_cmd = "/app/bin/check {{ .src }}"
 reload_cmd = "/app/bin/reload"

database/bin/check

@@ -3,15 +3,6 @@
 # Check that the configuration for deis-database is valid.
 #
 
-set -e
-
-# check that "<no value>" isn't in the templated files
-if [[ -f /etc/postgresql/9.3/main/postgresql.conf ]] ; then
-    grep -q -v "<no value>" /etc/postgresql/9.3/main/postgresql.conf
-fi
-if [[ -f /etc/postgresql/9.3/main/pg_hba.conf ]] ; then
-    grep -q -v "<no value>" /etc/postgresql/9.3/main/pg_hba.conf
-fi
-if [[ -f /usr/local/bin/reload ]] ; then
-    grep -q -v "<no value>" /usr/local/bin/reload
+if grep -q "<no value>" $1 ; then
+    exit 1
 fi

database/conf.d/pg_hba.conf.toml

@@ -7,5 +7,5 @@ mode  = "0640"
 keys = [
   "/deis/database",
 ]
-check_cmd = "/app/bin/check"
+check_cmd = "/app/bin/check {{ .src }}"
 reload_cmd = "/usr/local/bin/reload"

database/conf.d/postgresql.conf.toml

@@ -7,5 +7,5 @@ mode  = "0644"
 keys = [
   "/deis/database",
 ]
-check_cmd = "/app/bin/check"
+check_cmd = "/app/bin/check {{ .src }}"
 reload_cmd = "/usr/local/bin/reload"

database/conf.d/reload.toml

@@ -7,5 +7,5 @@ mode  = "0755"
 keys = [
   "/deis/database",
 ]
-check_cmd = "/app/bin/check"
+check_cmd = "/app/bin/check {{ .src }}"
 reload_cmd = "/usr/local/bin/reload"

registry/bin/check

@@ -3,9 +3,6 @@
 # Check that the configuration for deis-registry is valid.
 #
 
-if [[ -f /docker-registry/config/config.yml ]] ; then
-    set -e
-
-    # check that "<no value>" isn't in the templated file
-    grep -q -v "<no value>" /docker-registry/config/config.yml
+if grep -q "<no value>" $1 ; then
+    exit 1
 fi

registry/conf.d/config.toml

@@ -7,5 +7,5 @@ mode  = "0644"
 keys = [
   "/deis/registry",
 ]
-check_cmd = "/app/bin/check"
+check_cmd = "/app/bin/check {{ .src }}"
 reload_cmd = "/app/bin/reload"