github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: properly track failed check count

Browse Source 
Closes #3799
This commit is contained in:
Jose Diaz-Gonzalez
2019-12-09 13:52:53 -05:00
parent b4ab5a5764
commit ce60ef6bff
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/scheduler-docker-local/check-deploy
View File

@@ -205,6 +205,7 @@ scheduler-docker-local-check-deploy() {
[[ $DOKKU_TRACE ]] && dokku_log_verbose "$ curl $CURL_ARGS" [[ $DOKKU_TRACE ]] && dokku_log_verbose "$ curl $CURL_ARGS"
local ATTEMPT=0 local ATTEMPT=0
local SUCCESS=0
until [[ $SUCCESS == 1 || $ATTEMPT -ge $ATTEMPTS ]]; do until [[ $SUCCESS == 1 || $ATTEMPT -ge $ATTEMPTS ]]; do
local ATTEMPT=$((ATTEMPT + 1)) local ATTEMPT=$((ATTEMPT + 1))
dokku_log_verbose "Attempt $ATTEMPT/$ATTEMPTS. Waiting for $WAIT seconds ..." dokku_log_verbose "Attempt $ATTEMPT/$ATTEMPTS. Waiting for $WAIT seconds ..."
@@ -214,23 +215,22 @@ scheduler-docker-local-check-deploy() {
# shellcheck disable=SC2086 # shellcheck disable=SC2086
if OUTPUT=$(curl -# $CURL_ARGS 2>&1); then if OUTPUT=$(curl -# $CURL_ARGS 2>&1); then
# 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\"" SUCCESS=1
local FAILEDCHECKS=$((FAILEDCHECKS + 1)) break
fi fi
dokku_log_warn "$LOG_URL: expected to but did not find: \"$EXPECTED\""
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"
local FAILEDCHECKS=$((FAILEDCHECKS + 1))
fi fi
if [[ $FAILEDCHECKS -gt 0 ]]; then dokku_log_warn "Check attempt $ATTEMPT/$ATTEMPTS failed."
dokku_log_warn "Check attempt $ATTEMPT/$ATTEMPTS failed."
local SUCCESS=0
else
local SUCCESS=1
fi
done done
if [[ $SUCCESS -ne 1 ]]; then
FAILEDCHECKS=$((FAILEDCHECKS + 1))
fi
done done
if [[ $FAILEDCHECKS -gt 0 ]]; then if [[ $FAILEDCHECKS -gt 0 ]]; then