aboutsummaryrefslogtreecommitdiff
path: root/docker/lib/base_functions.sh
diff options
context:
space:
mode:
authorChristophe Romain <christophe.romain@process-one.net>2017-03-21 18:59:12 +0100
committerChristophe Romain <christophe.romain@process-one.net>2017-03-21 18:59:12 +0100
commit430fc8eb6235f6d73468187453a7376e5879a8bb (patch)
tree011f5f6b30f3ec1b3c0aab2daa79af6c87120178 /docker/lib/base_functions.sh
parentprosody2ejabberd: Fix offline message record type (diff)
Update docker files from latest Rafael's changes
Diffstat (limited to '')
-rw-r--r--docker/scripts/lib/base_functions.sh (renamed from docker/lib/base_functions.sh)16
1 files changed, 5 insertions, 11 deletions
diff --git a/docker/lib/base_functions.sh b/docker/scripts/lib/base_functions.sh
index d7bf97266..daadd1f68 100644
--- a/docker/lib/base_functions.sh
+++ b/docker/scripts/lib/base_functions.sh
@@ -29,16 +29,10 @@ is_true() {
}
-log() {
- local message=$1
- echo $message
-}
-
-
# overwrite this function to get hostname from other sources
# like dns or etcd
get_nodename() {
- log ${HOSTNAME}
+ echo ${HOSTNAME}
}
@@ -48,25 +42,25 @@ join_cluster() {
is_zero ${cluster_node} \
&& exit 0
- log "Join cluster..."
+ echo "Join cluster..."
local erlang_node_name=${ERLANG_NODE%@*}
local erlang_cluster_node="${erlang_node_name}@${cluster_node}"
response=$(${EJABBERDCTL} ping ${erlang_cluster_node})
while [ "$response" != "pong" ]; do
- log "Waiting for ${erlang_cluster_node}..."
+ echo "Waiting for ${erlang_cluster_node}..."
sleep 2
response=$(${EJABBERDCTL} ping ${erlang_cluster_node})
done
- log "Join cluster at ${erlang_cluster_node}... "
+ echo "Join cluster at ${erlang_cluster_node}... "
NO_WARNINGS=true ${EJABBERDCTL} join_cluster $erlang_cluster_node
if [ $? -eq 0 ]; then
touch ${CLUSTER_NODE_FILE}
else
- log "cloud not join cluster"
+ echo "cloud not join cluster"
exit 1
fi
}