Skip to content

Commit a3568c6

Browse files
committed
Amend wait_for_template logic
1 parent eecc87b commit a3568c6

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

jobs/kibana/templates/bin/kibana_ctl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,18 @@ export PIDFILE=/var/vcap/sys/run/kibana/kibana.pid
1717
function wait_for_template {
1818
local template_name="$1"
1919
local MASTER_URL="<%= p("kibana.elasticsearch.host") %>:<%= elasticsearch_port %>"
20+
local wait=0
2021

2122
set +e
2223
while true; do
2324
echo "Waiting for index template to be uploaded: $template_name"
24-
curl -X HEAD -f -i "$MASTER_URL"/_template/$template_name > /dev/null 2>&1
25-
[ $? ] && break
26-
sleep 5
25+
curl -f -I "$MASTER_URL"/_template/$template_name > /dev/null 2>&1 && break
26+
if [ $wait -gt 120 ]; then
27+
echo $template_name not found
28+
exit 1
29+
fi
30+
let wait+=10
31+
sleep 10
2732
done
2833
echo "Found $template_name"
2934
set -e

0 commit comments

Comments
 (0)