Skip to content

Commit 1845649

Browse files
Gabriel MonroyMatthew Fisher
authored andcommitted
chore(journal): suppress etcdctl output, add other clarifying output
1 parent ce47b24 commit 1845649

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

bin/boot

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@ done
2424
sleep $(($ETCD_TTL+1))
2525

2626
# seed initial service configuration if necessary
27-
if ! etcdctl -C $ETCD ls $ETCD_PATH >/dev/null 2>/dev/null; then
28-
etcdctl -C $ETCD set $ETCD_PATH/protocol ${DEIS_PROTOCOL:-http}
29-
etcdctl -C $ETCD set $ETCD_PATH/secretKey ${DEIS_SECRET_KEY:-`openssl rand -base64 64 | tr -d '\n'`}
30-
etcdctl -C $ETCD set $ETCD_PATH/builderKey ${DEIS_BUILDER_KEY:-`openssl rand -base64 64 | tr -d '\n'`}
27+
if ! etcdctl -C $ETCD ls $ETCD_PATH >/dev/null 2>&1; then
28+
etcdctl -C $ETCD set $ETCD_PATH/protocol ${DEIS_PROTOCOL:-http} >/dev/null
29+
etcdctl -C $ETCD set $ETCD_PATH/secretKey ${DEIS_SECRET_KEY:-`openssl rand -base64 64 | tr -d '\n'`} >/dev/null
30+
etcdctl -C $ETCD set $ETCD_PATH/builderKey ${DEIS_BUILDER_KEY:-`openssl rand -base64 64 | tr -d '\n'`} >/dev/null
3131
fi
3232

3333
# wait for confd to run once and install initial templates
3434
until confd -onetime -node $ETCD -config-file /app/confd.toml 2>/dev/null; do
35-
echo "waiting for confd to write initial templates..."
35+
echo "controller: waiting for confd to write initial templates..."
3636
sleep $(($ETCD_TTL/2)) # sleep for half the TTL
3737
done
3838

3939
# wait for confd to populate all values
4040
while grep -q '<no value>' /templates/confd_settings.py; do
41-
echo "waiting for confd to write all values..."
41+
echo "controller: waiting for confd to write all values..."
4242
confd -onetime -node $ETCD -config-file /app/confd.toml 2>/dev/null
4343
sleep $(($ETCD_TTL/2)) # sleep for half the TTL
4444
done
@@ -67,6 +67,8 @@ trap on_exit INT TERM
6767
confd -node $ETCD -config-file /app/confd.toml &
6868
CONFD_PID=$!
6969

70+
echo deis-controller running...
71+
7072
# publish the service to etcd using the injected HOST and PORT
7173
if [[ ! -z $PUBLISH ]]; then
7274

0 commit comments

Comments
 (0)