Merge pull request #3517 from mboersma/back-to-confd-interval

fix(*): use "confd --interval 5" instead of "--watch"
deis · Apr 17, 2015 · 8e960ca · 8e960ca
2 parents 54757a0 + 4195e39
commit 8e960ca
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/builder/image/bin/boot b/builder/image/bin/boot
@@ -47,7 +47,7 @@ until confd -onetime -node $ETCD --confdir /app --log-level error; do
 done
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD --confdir /app --log-level error --watch &
+confd -node $ETCD --confdir /app --log-level error --interval 5 &
 CONFD_PID=$!
 
 # remove any pre-existing docker.sock

diff --git a/controller/bin/boot b/controller/bin/boot
@@ -91,7 +91,7 @@ function on_exit() {
 trap on_exit TERM
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD --confdir /app --log-level error --watch &
+confd -node $ETCD --confdir /app --log-level error --interval 5 &
 CONFD_PID=$!
 
 echo deis-controller running...

diff --git a/database/bin/boot b/database/bin/boot
@@ -110,7 +110,7 @@ function on_exit() {
 trap on_exit INT TERM
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD -confdir /app --log-level error --watch &
+confd -node $ETCD -confdir /app --log-level error --interval 5 &
 CONFD_PID=$!
 
 # wait for the service to become available

diff --git a/registry/bin/boot b/registry/bin/boot
@@ -67,7 +67,7 @@ function on_exit() {
 trap on_exit INT TERM
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD --confdir /app --log-level error --watch &
+confd -node $ETCD --confdir /app --log-level error --interval 5 &
 CONFD_PID=$!
 
 echo deis-registry running...

diff --git a/store/admin/bin/boot b/store/admin/bin/boot
@@ -6,7 +6,7 @@
 ETCD_PORT=${ETCD_PORT:-4001}
 ETCD="$HOST:$ETCD_PORT"
 
-confd -node $ETCD --confdir /app --log-level error --watch &
+confd -node $ETCD --confdir /app --log-level error --interval 5 &
 
 # loop forever until the container is stopped
 while true; do

diff --git a/store/gateway/bin/boot b/store/gateway/bin/boot
@@ -106,7 +106,7 @@ function on_exit() {
 trap on_exit INT TERM
 
 # spawn confd in the background to update services based on etcd changes
-confd -node $ETCD --confdir /app --log-level error --watch &
+confd -node $ETCD --confdir /app --log-level error --interval 5 &
 CONFD_PID=$!
 
 echo deis-store-gateway running...
@@ -142,4 +142,3 @@ if [[ ! -z $EXTERNAL_PORT ]]; then
 fi
 
 wait
-