From e47f6e5803c532a0a8eb178678bb0736b3f4e986 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 28 Apr 2018 01:13:48 -0400 Subject: [PATCH] fix: use dokku_log_warn helper for warning messages in the ps plugin --- plugins/ps/functions | 10 +++++----- plugins/ps/subcommands/default | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/ps/functions b/plugins/ps/functions index 39401bc20..b65d4cba4 100755 --- a/plugins/ps/functions +++ b/plugins/ps/functions @@ -97,11 +97,11 @@ ps_start() { if ! (is_app_running "$APP"); then release_and_deploy "$APP" "$IMAGE_TAG" else - echo "App $APP already running" + dokku_log_warn "App $APP already running" fi plugn trigger proxy-build-config "$APP" else - echo "App $APP has not been deployed" + dokku_log_warn "App $APP has not been deployed" fi } @@ -109,9 +109,9 @@ ps_stop() { declare desc="stops app" local APP="$1"; verify_app_name "$APP" - ! (is_deployed "$APP") && echo "App $APP has not been deployed" && exit 0 + ! (is_deployed "$APP") && dokku_log_warn "App $APP has not been deployed" && exit 0 - echo "Stopping $APP ..." + dokku_log_quiet "Stopping $APP ..." local DOKKU_SCHEDULER=$(config_get "$APP" DOKKU_SCHEDULER || echo "docker-local") plugn trigger scheduler-stop "$DOKKU_SCHEDULER" "$APP" plugn trigger post-stop "$APP" @@ -132,7 +132,7 @@ ps_restart() { if (is_deployed "$APP"); then release_and_deploy "$APP" "$IMAGE_TAG" else - echo "App $APP has not been deployed" + dokku_log_warn "App $APP has not been deployed" fi } diff --git a/plugins/ps/subcommands/default b/plugins/ps/subcommands/default index 07f044d57..cc2ecfbe2 100755 --- a/plugins/ps/subcommands/default +++ b/plugins/ps/subcommands/default @@ -10,7 +10,7 @@ ps_main_cmd() { [[ -z $2 ]] && dokku_log_fail "Please specify an app to run the command on" local APP="$2"; verify_app_name "$APP" - ! (is_deployed "$APP") && echo "App $APP has not been deployed" && exit 0 + ! (is_deployed "$APP") && dokku_log_warn "App $APP has not been deployed" && exit 0 local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP")