chore(journal): suppress etcdctl output, add other clarifying output

Author: Gabriel Monroy

builder/bin/boot

@@ -30,7 +30,7 @@ fi
 
 # wait for confd to run once and install initial templates
 until confd -onetime -node $ETCD -config-file /app/confd.toml; do
-	echo "waiting for confd to write initial templates..."
+	echo "builder: waiting for confd to write initial templates..."
 	sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
 
@@ -65,6 +65,8 @@ function on_exit() {
 }
 trap on_exit INT TERM EXIT
 
+echo deis-builder running...
+
 # publish the service to etcd using the injected HOST and PORT
 if [[ ! -z $PUBLISH ]]; then
 

cache/bin/boot

@@ -30,7 +30,7 @@ fi
 
 # wait for confd to run once and install initial templates
 until confd -onetime -node $ETCD -config-file /app/confd.toml; do
-	echo "waiting for confd to write initial templates..."
+	echo "cache: waiting for confd to write initial templates..."
 	sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
 
@@ -50,6 +50,8 @@ trap on_exit INT TERM
 confd -node $ETCD -config-file /app/confd.toml &
 CONFD_PID=$!
 
+echo deis-cache running...
+
 # publish the service to etcd using the injected HOST and PORT
 if [[ ! -z $PUBLISH ]]; then
 

controller/bin/boot

@@ -24,21 +24,21 @@ done
 sleep $(($ETCD_TTL+1))
 
 # seed initial service configuration if necessary
-if ! etcdctl -C $ETCD ls $ETCD_PATH >/dev/null 2>/dev/null; then
-	etcdctl -C $ETCD set $ETCD_PATH/protocol ${DEIS_PROTOCOL:-http}
-	etcdctl -C $ETCD set $ETCD_PATH/secretKey ${DEIS_SECRET_KEY:-`openssl rand -base64 64 | tr -d '\n'`}
-	etcdctl -C $ETCD set $ETCD_PATH/builderKey ${DEIS_BUILDER_KEY:-`openssl rand -base64 64 | tr -d '\n'`}
+if ! etcdctl -C $ETCD ls $ETCD_PATH >/dev/null 2>&1; then
+	etcdctl -C $ETCD set $ETCD_PATH/protocol ${DEIS_PROTOCOL:-http} >/dev/null
+	etcdctl -C $ETCD set $ETCD_PATH/secretKey ${DEIS_SECRET_KEY:-`openssl rand -base64 64 | tr -d '\n'`} >/dev/null
+	etcdctl -C $ETCD set $ETCD_PATH/builderKey ${DEIS_BUILDER_KEY:-`openssl rand -base64 64 | tr -d '\n'`} >/dev/null
 fi
 
 # wait for confd to run once and install initial templates
 until confd -onetime -node $ETCD -config-file /app/confd.toml 2>/dev/null; do
-	echo "waiting for confd to write initial templates..."
+	echo "controller: waiting for confd to write initial templates..."
 	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 "waiting for confd to write all values..."
+       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
@@ -67,6 +67,8 @@ trap on_exit INT TERM
 confd -node $ETCD -config-file /app/confd.toml &
 CONFD_PID=$!
 
+echo deis-controller running...
+
 # publish the service to etcd using the injected HOST and PORT
 if [[ ! -z $PUBLISH ]]; then
 

database/bin/boot

@@ -31,18 +31,18 @@ done
 sleep $(($ETCD_TTL+1))
 
 # seed initial service configuration if necessary
-if ! etcdctl -C $ETCD ls $ETCD_PATH >/dev/null 2>/dev/null; then
-	etcdctl -C $ETCD set $ETCD_PATH/engine postgresql_psycopg2
-	etcdctl -C $ETCD set $ETCD_PATH/adminUser ${PG_ADMIN_USER:-postgres}
-	etcdctl -C $ETCD set $ETCD_PATH/adminPass ${PG_ADMIN_PASS:-changeme123}
+if ! etcdctl -C $ETCD ls $ETCD_PATH >/dev/null 2>&1; then
+	etcdctl -C $ETCD set $ETCD_PATH/engine postgresql_psycopg2 >/dev/null
+	etcdctl -C $ETCD set $ETCD_PATH/adminUser ${PG_ADMIN_USER:-postgres} >/dev/null
+	etcdctl -C $ETCD set $ETCD_PATH/adminPass ${PG_ADMIN_PASS:-changeme123} >/dev/null
 	etcdctl -C $ETCD set $ETCD_PATH/user ${PG_USER_NAME:-deis} >/dev/null
-	etcdctl -C $ETCD set $ETCD_PATH/password ${PG_USER_PASS:-changeme123}
-	etcdctl -C $ETCD set $ETCD_PATH/name ${PG_USER_DB:-deis}
+	etcdctl -C $ETCD set $ETCD_PATH/password ${PG_USER_PASS:-changeme123} >/dev/null
+	etcdctl -C $ETCD set $ETCD_PATH/name ${PG_USER_DB:-deis} >/dev/null
 fi
 
 # wait for confd to run once and install initial templates
 until confd -onetime -node $ETCD -config-file /app/confd.toml; do
-	echo "waiting for confd to write initial templates..."
+	echo "database: waiting for confd to write initial templates..."
 	sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
 
@@ -70,6 +70,8 @@ sleep 1 && while [[ -z $(netstat -lnt | awk "\$6 == \"LISTEN\" && \$4 ~ \".5432\
 # perform a one-time reload to populate database entries
 /usr/local/bin/reload
 
+echo deis-database running...
+
 # publish the service to etcd using the injected HOST and PORT
 if [[ ! -z $PUBLISH ]]; then
 

logger/bin/boot

@@ -24,18 +24,18 @@ done
 sleep $(($ETCD_TTL+1))
 
 # seed initial service configuration if necessary
-if ! etcdctl -C $ETCD ls $ETCD_PATH >/dev/null 2>/dev/null; then
+if ! etcdctl -C $ETCD ls $ETCD_PATH >/dev/null 2>&1; then
 	etcdctl -C $ETCD mkdir $ETCD_PATH >/dev/null 2>&1 || true
 fi
 
 # wait for confd to run once and install initial templates
 until confd -onetime -node $ETCD -config-file /app/confd.toml; do
-	echo "waiting for confd to write initial templates..."
+	echo "logger: waiting for confd to write initial templates..."
 	sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
 
 # cleanup old pidfile's
-rm -f /var/run/rsyslog.pid
+test -e /var/run/rsyslog.pid && rm -f /var/run/rsyslog.pid
 
 # spawn the service in the background
 /usr/sbin/rsyslogd -n &
@@ -52,6 +52,8 @@ trap on_exit INT TERM
 confd -node $ETCD -config-file /app/confd.toml &
 CONFD_PID=$!
 
+echo deis-logger running...
+
 # publish the service to etcd using the injected HOST and PORT
 if [[ ! -z $PUBLISH ]]; then
 

registry/bin/boot

@@ -34,7 +34,7 @@ fi
 
 # wait for confd to run once and install initial templates
 until confd -onetime -node $ETCD -config-file /app/confd.toml; do
-	echo "waiting for confd to write initial templates..."
+	echo "registry: waiting for confd to write initial templates..."
 	sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
 
@@ -55,6 +55,8 @@ trap on_exit INT TERM
 confd -node $ETCD -config-file /app/confd.toml &
 CONFD_PID=$!
 
+echo deis-registry running...
+
 # publish the service to etcd using the injected HOST and PORT
 if [[ ! -z $PUBLISH ]]; then
 

router/bin/boot

@@ -25,13 +25,13 @@ sleep $(($ETCD_TTL+1))
 
 # seed initial service configuration if necessary
 if ! etcdctl -C $ETCD ls /deis/services >/dev/null 2>&1; then
-	etcdctl -C $ETCD mkdir /deis/services || true 2>/dev/null
-	etcdctl -C $ETCD set $ETCD_PATH/port ${PORT:-80}
+	etcdctl -C $ETCD mkdir /deis/services || true >/dev/null 2>&1
+	etcdctl -C $ETCD set $ETCD_PATH/port ${PORT:-80} >/dev/null
 fi
 
 # wait for confd to run once and install initial templates
 until confd -onetime -node $ETCD -config-file /app/confd.toml >/dev/null 2>/dev/null; do
-    echo "waiting for confd to write initial templates..."
+    echo "router: waiting for confd to write initial templates..."
     sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
 
@@ -51,6 +51,8 @@ trap on_exit INT TERM
 confd -node $ETCD -config-file /app/confd.toml &
 CONFD_PID=$!
 
+echo deis-router running...
+
 # publish the service to etcd using the injected HOST and PORT
 if [[ ! -z $PUBLISH ]]; then