reset var elapsed

Author: manolo

scripts/pit/lib/lib-ccenter.sh

@@ -42,10 +42,10 @@ waitForCC() {
         "")
           log "Control center not installed in k8s" && return 1 ;;
         Running*)
-          echo "" && log "Done ($elapsed secs.) - $H"
+          echo "" && log "Done ($elapsed secs.) - Status: $H"
           return 0 ;;
         *)
-          [ "$H" != "$last" ] && ([ -n "$last" ] && echo "" || true) && log "Control center initializing - $H" || printf .
+          [ "$H" != "$last" ] && ([ -n "$last" ] && echo "" || true) && log "Control center initializing - Status: $H" || printf .
           last="$H"
           sleep 1
           ;;

scripts/pit/lib/lib-utils.sh

@@ -414,13 +414,14 @@ waitUntilHttpResponse() {
   cgrep="egrep -q '${2:-^< HTTP/}'"
   cmd="curl -s -L -v --insecure $1"
   cmd "$cmd 2>&1 | $cgrep"
+  elapsed=0
   while true; do
     H=`$cmd 2>&1`
     err=$?
     [ $err != 0 ] && echo "$H" | grep  " refused" && printf "\n" && warn "ERROR Server not listening in URL $1" && return 1
     [ $err = 0 ] && echo "$H" | eval $cgrep && printf "\n" && return 0 || (printf . && sleep 3)
-    elapsed=`expr ${elapsed:-0} + 1`
-    [ "$elapsed" -ge "${3:-180}" ] && log "Timeout ${3:-180} sec. exceeded." && return 1
+    elapsed=`expr $elapsed + 3`
+    [ "$elapsed" -ge "${3:-180}" ] && printf "\n" && log "Timeout ${3:-180} sec. exceeded." && return 1
   done
 }