fix linting issues

rename UNCHECKED -> FAILEDCHECKS
This commit is contained in:
Josh Cohen committed 2015-04-11 01:10:14 +00:00
1 parent 132c0b1c81
commit cc565661e3
1 file changed
+7 -10
+7 -10
View File
@@ -104,13 +104,12 @@ while read LINE ; do
fi fi
done done
UNCHECKED=0
ATTEMPT=0 ATTEMPT=0
until [[ $SUCCESS == 1 || $ATTEMPT -ge $ATTEMPTS ]] until [[ $SUCCESS == 1 || $ATTEMPT -ge $ATTEMPTS ]]
do do
UNCHECKED=0 FAILEDCHECKS=0
ATTEMPT=$(expr $ATTEMPT + 1 ) ATTEMPT=$(( $ATTEMPT + 1 ))
dokku_log_info1 "Attempt $ATTEMPT/$ATTEMPTS Waiting for $WAIT seconds ..." dokku_log_info1 "Attempt $ATTEMPT/$ATTEMPTS Waiting for $WAIT seconds ..."
sleep $WAIT sleep $WAIT
@@ -167,18 +166,16 @@ do
# OUTPUT contains the HTTP response # OUTPUT contains the HTTP response
if [[ ! "$OUTPUT" =~ $EXPECTED ]] ; then if [[ ! "$OUTPUT" =~ $EXPECTED ]] ; then
dokku_log_warn "$LOG_URL: expected to but did not find: \"$EXPECTED\"" dokku_log_warn "$LOG_URL: expected to but did not find: \"$EXPECTED\""
UNCHECKED=$(expr $UNCHECKED + 1 ) FAILEDCHECKS=$(( $FAILEDCHECKS + 1 ))
fi fi
else else
# Failed to connect/no response, OUTPUT contains error message # Failed to connect/no response, OUTPUT contains error message
dokku_log_warn "$OUTPUT" dokku_log_warn "$OUTPUT"
UNCHECKED=$(expr $UNCHECKED + 1 ) FAILEDCHECKS=$(( $FAILEDCHECKS + 1 ))
fi fi
done done
if [ $UNCHECKED -gt 0 ]; then if [ $FAILEDCHECKS -gt 0 ]; then
dokku_log_warn "Check attempt $ATTEMPT/$ATTEMPTS failed." dokku_log_warn "Check attempt $ATTEMPT/$ATTEMPTS failed."
SUCCESS=0 SUCCESS=0
else else
@@ -186,8 +183,8 @@ do
fi fi
done done
if [ $UNCHECKED -gt 0 ]; then if [ $FAILEDCHECKS -gt 0 ]; then
dokku_log_fail "Could not start due to $UNCHECKED failed checks." dokku_log_fail "Could not start due to $FAILEDCHECKS failed checks."
exit 1 exit 1
fi fi