From 9a2c8e04a57526e7ee31a14a6ba2e899d714cf8a Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Mon, 12 Aug 2019 17:39:01 -0400
Subject: [PATCH] feat: quiet down deploys

---
 plugins/common/functions                        | 2 +-
 plugins/scheduler-docker-local/core-post-deploy | 9 +++++----
 plugins/scheduler-docker-local/scheduler-deploy | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/common/functions b/plugins/common/functions
index c6cf31225..663e1e155 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -391,7 +391,7 @@ copy_from_image() {
     fi
 
     TMP_FILE_COMMAND_OUTPUT=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX")
-    trap "rm -rf '$TMP_FILE_COMMAND_OUTPUT' >/dev/null || true" RETURN
+    trap "rm -rf '$TMP_FILE_COMMAND_OUTPUT' >/dev/null 2>&1 || true" RETURN
 
     local CID=$("$DOCKER_BIN" create "${DOCKER_CREATE_LABEL_ARGS[@]}" $DOKKU_GLOBAL_RUN_ARGS "$IMAGE")
     "$DOCKER_BIN" cp "$CID:$SRC_FILE" "$TMP_FILE_COMMAND_OUTPUT" 2>/dev/null || true
diff --git a/plugins/scheduler-docker-local/core-post-deploy b/plugins/scheduler-docker-local/core-post-deploy
index f78f34c49..f6733ade8 100755
--- a/plugins/scheduler-docker-local/core-post-deploy
+++ b/plugins/scheduler-docker-local/core-post-deploy
@@ -15,6 +15,7 @@ scheduler-docker-local-core-post-deploy() {
     return
   fi
 
+  dokku_log_info1 "Renaming containers"
   local PROCTYPES="$(egrep -v "^#" "$DOKKU_ROOT/$APP/DOKKU_SCALE" | awk -F '=' '{ print $1 }' | xargs)"
   local CONTAINER_FILES="$(find "$DOKKU_ROOT/$APP" -maxdepth 1 -name "CONTAINER.*" -printf "%f\n" 2>/dev/null | sort -t . -k 3 -n | xargs)"
 
@@ -22,7 +23,7 @@ scheduler-docker-local-core-post-deploy() {
   for CONTAINER_FILE in $CONTAINER_FILES; do
     local CONTAINER_TYPE="$(awk -F '.' '{ print $2 }' <<<"$CONTAINER_FILE")"
     if [[ "$(is_val_in_list "$CONTAINER_TYPE" "$PROCTYPES" " ")" == "false" ]]; then
-      dokku_log_info1 "Container type ($CONTAINER_TYPE) is no longer defined. Removing state"
+      dokku_log_verbose_quiet "Container type ($CONTAINER_TYPE) is no longer defined. Removing state"
       local IP_FILE="${CONTAINER_FILE//CONTAINER/IP}"
       local PORT_FILE="${CONTAINER_FILE//CONTAINER/PORT}"
       rm -f "$DOKKU_ROOT/$APP/$CONTAINER_FILE" "$DOKKU_ROOT/$APP/$IP_FILE" "$DOKKU_ROOT/$APP/$PORT_FILE"
@@ -38,7 +39,7 @@ scheduler-docker-local-core-post-deploy() {
     # TODO: Ensure these are from the current service
     local PREVIOUS_CIDS=$("$DOCKER_BIN" ps -a -q -f name="^.?$NAME\$" | xargs) || true
     if [[ -n $PREVIOUS_CIDS ]]; then
-      dokku_log_info1_quiet "Found previous container(s) ($PREVIOUS_CIDS) named $NAME"
+      dokku_log_verbose_quiet "Found previous container(s) ($PREVIOUS_CIDS) named $NAME"
       # in case $PREVIOUS_CIDS has more than one entry
       local cid
       for cid in $PREVIOUS_CIDS; do
@@ -46,7 +47,7 @@ scheduler-docker-local-core-post-deploy() {
         # dead containers cannot be renamed
         if [[ "$PREVIOUS_CONTAINER_STATUS" != "dead" ]]; then
           local CONTAINER_DATE_NAME="$NAME.$(date +%s)"
-          dokku_log_info2_quiet "Renaming container ($cid) ${NAME} to $CONTAINER_DATE_NAME"
+          dokku_log_verbose_quiet "Renaming container ($cid) ${NAME} to $CONTAINER_DATE_NAME"
           "$DOCKER_BIN" rename "$NAME" "$CONTAINER_DATE_NAME" >/dev/null 2>&1 || dokku_log_warn "Unable to rename container"
         fi
       done
@@ -54,7 +55,7 @@ scheduler-docker-local-core-post-deploy() {
     local ID=$(cat "$container")
     local CURRENT_NAME=$("$DOCKER_BIN" inspect -f '{{.Name}}' "$ID" | tr -d /)
     if [[ -n "$CURRENT_NAME" ]]; then
-      dokku_log_info2_quiet "Renaming container (${ID:0:12}) $CURRENT_NAME to $NAME"
+      dokku_log_verbose_quiet "Renaming container (${ID:0:12}) $CURRENT_NAME to $NAME"
       "$DOCKER_BIN" rename "$CURRENT_NAME" "$NAME" >/dev/null
     fi
   done
diff --git a/plugins/scheduler-docker-local/scheduler-deploy b/plugins/scheduler-docker-local/scheduler-deploy
index d48305b22..4dd2bb66a 100755
--- a/plugins/scheduler-docker-local/scheduler-deploy
+++ b/plugins/scheduler-docker-local/scheduler-deploy
@@ -173,7 +173,7 @@ scheduler-docker-local-scheduler-deploy() {
     dokku_log_info1 "Shutting down old containers in $WAIT seconds"
     local oldid
     for oldid in $oldids; do
-      dokku_log_info2 "$oldid"
+      dokku_log_verbose_quiet "$oldid"
       fn-scheduler-docker-local-register-retired-container "$APP" "$oldid" "$WAIT"
     done
     (