summaryrefslogtreecommitdiffstats
path: root/auth/sample
diff options
context:
space:
mode:
Diffstat (limited to 'auth/sample')
-rw-r--r--auth/sample/bin/pod_wait.sh47
-rw-r--r--auth/sample/bin/service.sh2
2 files changed, 30 insertions, 19 deletions
diff --git a/auth/sample/bin/pod_wait.sh b/auth/sample/bin/pod_wait.sh
index 71773be7..08998db0 100644
--- a/auth/sample/bin/pod_wait.sh
+++ b/auth/sample/bin/pod_wait.sh
@@ -14,7 +14,6 @@ function status {
fi
}
-echo $APP $OTHER
function check {
if [ -d "$DIR" ]; then
@@ -28,23 +27,35 @@ function check {
fi
}
-echo "App $APP is waiting to start until $OTHER is ready"
-status "waiting for $OTHER"
+function start {
+ n=0
+ while [ $n -lt 40 ]; do
+ rv="$(check)"
+ echo "$OTHER is $rv"
+ if [ "$rv" = "ready" ]; then
+ # This is critical. Until status is literally "ready" in the status directory, no processes will start
+ status ready
+ echo "Starting $@"
+ n=10000
+ else
+ (( ++n ))
+ echo "Sleep 10 (iteration $n)"
+ sleep 10
+ fi
+ done
+}
+
+if [ "sleep" = "$OTHER" ]; then
+ echo "Sleeping $1"
+ status "Sleeping $1"
+ sleep $1
+ shift
+ status "ready"
+else
+ echo "App $APP is waiting to start until $OTHER is ready"
+ status "waiting for $OTHER"
-n=0
-while [ $n -lt 40 ]; do
- rv="$(check)"
- echo "$OTHER is $rv"
- if [ "$rv" = "ready" ]; then
- # This is critical. Until status is literally "ready" in the status directory, no processes will start
- status ready
- echo "Starting $@"
- n=10000
- else
- (( ++n ))
- echo "Sleep 10 (iteration $n)"
- sleep 10
- fi
-done
+ start
+fi
eval "$@"
diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh
index 9cbe4533..f261c18e 100644
--- a/auth/sample/bin/service.sh
+++ b/auth/sample/bin/service.sh
@@ -99,7 +99,7 @@ if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then
CASS_HOST=${CASS_HOST:="localhost:127.0.0.1"}
CASS_PASS=$("$JAVA" -jar $CONFIG/bin/aaf-cadi-aaf-*-full.jar cadi digest "${CASSANDRA_PASSWORD:-cassandra}" $LOCAL/org.osaaf.aaf.keyfile)
CASS_NAME=${CASS_HOST/:*/}
- sed -i.backup -e "s/\\(cassandra.clusters=\\).*/\\1${CASSANDRA_CLUSTERS:=$CASS_NAME}/" \
+ sed -i.backup -e "s/\\(cassandra.clusters=\\).*/\\1${CASSANDRA_CLUSTERS:=$CASS_HOST}/" \
-e "s/\\(cassandra.clusters.user=\\).*/\\1${CASSANDRA_USER:=cassandra}/" \
-e "s/\\(cassandra.clusters.password=enc:\\).*/\\1$CASS_PASS/" \
-e "s/\\(cassandra.clusters.port=\\).*/\\1${CASSANDRA_PORT:=9042}/" \