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

Merge pull request #3702 from dokku/better-output

Browse Source 
Cleanup build and destroy logging output
This commit is contained in:
Jose Diaz-Gonzalez
2019-10-03 11:57:50 -04:00
committed by GitHub
parent 8c6e4c6483 498bdd0491
commit 24c47e17f8
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/apps/functions
View File

@@ -34,7 +34,7 @@ apps_destroy() {
fi
fi
echo "Destroying $APP (including all add-ons)"
dokku_log_info1 "Destroying $APP (including all add-ons)"
plugn trigger pre-delete "$APP" "$IMAGE_TAG"
local DOKKU_SCHEDULER=$(get_app_scheduler "$APP")

2
plugins/common/functions
View File

@@ -538,7 +538,7 @@ is_app_running() {
dokku_log_warn "Deprecated: ps#fn-is-app-running"
verify_app_name "$APP"
local APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP")
local APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP" 2>/dev/null)
if [[ -n "$APP_RUNNING_CONTAINER_IDS" ]]; then
return 0

2
plugins/ps/subcommands/default
View File

@@ -14,7 +14,7 @@ ps_main_cmd() {
verify_app_name "$APP"
! (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")
local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP" 2>/dev/null)
local CID
for CID in $DOKKU_APP_RUNNING_CONTAINER_IDS; do

2
plugins/scheduler-docker-local/scheduler-deploy
View File

@@ -50,7 +50,7 @@ scheduler-docker-local-scheduler-deploy() {
if [[ "$(is_app_proctype_checks_disabled "$APP" "$PROC_TYPE")" == "true" ]]; then
dokku_log_info1 "zero downtime is disabled for app ($APP.$PROC_TYPE). stopping currently running containers"
local cid proctype_oldids="$(get_app_running_container_ids "$APP" "$PROC_TYPE")"
local cid proctype_oldids="$(get_app_running_container_ids "$APP" "$PROC_TYPE" 2>/dev/null)"
for cid in $proctype_oldids; do
dokku_log_info2 "stopping $APP.$PROC_TYPE ($cid)"

2
plugins/scheduler-docker-local/scheduler-stop
View File

@@ -13,7 +13,7 @@ scheduler-docker-local-scheduler-stop() {
return
fi
local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP")
local DOKKU_APP_RUNNING_CONTAINER_IDS=$(get_app_running_container_ids "$APP" 2>/dev/null)
local DOKKU_DOCKER_STOP_TIMEOUT="$(config_get "$APP" DOKKU_DOCKER_STOP_TIMEOUT || true)"
[[ -n "$DOKKU_DOCKER_STOP_TIMEOUT" ]] && DOCKER_STOP_TIME_ARG="--time=${DOKKU_DOCKER_STOP_TIMEOUT}"