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

Ensure we release the trap avoid running cleanup twice

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2016-03-29 23:31:03 -04:00
parent af97275139
commit e7e249d1d3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/checks/check-deploy
View File

@@ -58,7 +58,7 @@ checks_check_deploy() {
eval "$(config_export global)" eval "$(config_export global)"
eval "$(config_export app "$APP")" eval "$(config_export app "$APP")"
if [[ "$(is_app_checks_enabled "$APP")" == "false" ]];then if [[ "$(is_app_checks_enabled "$APP")" == "false" ]]; then
dokku_log_info2_quiet "Zero downtime checks for app ($APP) have been disabled. moving on..." dokku_log_info2_quiet "Zero downtime checks for app ($APP) have been disabled. moving on..."
exit 0 exit 0
fi fi
@@ -115,6 +115,7 @@ checks_check_deploy() {
dokku_log_fail "App container failed to start!!" dokku_log_fail "App container failed to start!!"
fi fi
trap - EXIT
dokku_log_info1 "Default container check successful!" && exit 0 dokku_log_info1 "Default container check successful!" && exit 0
fi fi
@@ -231,6 +232,7 @@ checks_check_deploy() {
exit 1 exit 1
fi fi
trap - EXIT
dokku_log_info1 "All checks successful!" dokku_log_info1 "All checks successful!"
} }