From 12b82b67e70a733009d55bac97935a15974aff15 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 11 Jan 2019 11:21:56 -0500 Subject: [PATCH] fix: correct early exit 1 in apps:report Previously, if running 'dokku report --all', the early exit 1 in apps:report would cause the entire process to bail, resulting in a partial report. Instead, we exit 0, allowing plugn to continue. Technically a non-deployed app is not an error case at this position. --- plugins/apps/internal-functions | 2 +- plugins/common/functions | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/plugins/apps/internal-functions b/plugins/apps/internal-functions index a38e6fda0..36cb1a637 100755 --- a/plugins/apps/internal-functions +++ b/plugins/apps/internal-functions @@ -55,7 +55,7 @@ cmd-apps-report-single() { if [[ "$use_echo" ]]; then echo "not deployed" else - dokku_log_fail "not deployed" + dokku_log_exit "not deployed" fi fi else diff --git a/plugins/common/functions b/plugins/common/functions index 69938491c..9478c2d7d 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -108,6 +108,22 @@ dokku_log_warn() { echo " ! $*" 1>&2 } +dokku_log_exit_quiet() { + declare desc="log exit formatter" + if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then + echo "$@" 1>&2 + fi + exit 0 +} + +dokku_log_exit() { + declare desc="log exit formatter" + if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then + echo "$@" 1>&2 + fi + exit 0 +} + dokku_log_fail_quiet() { declare desc="log fail formatter" if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then