From d1319977d6f13fe84a797659e839c92295a917a0 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 5 Sep 2021 00:35:57 -0400
Subject: [PATCH] fix: add log message when rename fails and continue

This allows folks to later investigate why the rename failed (probably an app bug) and helpfully posts the container logs.

If multiple containers fail, they may have a ton of output, but this is better than not knowing what is going on.

Closes #3900
---
 plugins/scheduler-docker-local/check-deploy     | 4 ++--
 plugins/scheduler-docker-local/core-post-deploy | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/scheduler-docker-local/check-deploy b/plugins/scheduler-docker-local/check-deploy
index b8d80c472..6c204c709 100755
--- a/plugins/scheduler-docker-local/check-deploy
+++ b/plugins/scheduler-docker-local/check-deploy
@@ -87,9 +87,9 @@ trigger-scheduler-docker-local-check-deploy() {
     local id="$1"
     rm -rf "$CHECK_DEPLOY_TMP_WORK_DIR" &>/dev/null || true
     if [[ $id ]]; then
-      dokku_log_info2_quiet "$APP $DOKKU_APP_CONTAINER_TYPE container output:"
+      dokku_log_info2_quiet "Start of $APP $DOKKU_APP_CONTAINER_TYPE container output:"
       dokku_container_log_verbose_quiet "$id"
-      dokku_log_info2_quiet "end $APP $DOKKU_APP_CONTAINER_TYPE container output"
+      dokku_log_info2_quiet "End of $APP $DOKKU_APP_CONTAINER_TYPE container output"
     fi
   }
   trap "checks_check_deploy_cleanup $DOKKU_APP_CONTAINER_ID" RETURN INT TERM EXIT
diff --git a/plugins/scheduler-docker-local/core-post-deploy b/plugins/scheduler-docker-local/core-post-deploy
index d29f72b02..5100ebf84 100755
--- a/plugins/scheduler-docker-local/core-post-deploy
+++ b/plugins/scheduler-docker-local/core-post-deploy
@@ -55,8 +55,13 @@ trigger-scheduler-docker-local-core-post-deploy() {
     local ID=$(cat "$container")
     local CURRENT_NAME=$("$DOCKER_BIN" container inspect --format '{{.Name}}' "$ID" | tr -d /)
     if [[ -n "$CURRENT_NAME" ]]; then
-      dokku_log_verbose_quiet "Renaming container (${ID:0:12}) $CURRENT_NAME to $NAME"
-      "$DOCKER_BIN" container rename "$CURRENT_NAME" "$NAME" >/dev/null
+      dokku_log_verbose_quiet "Renaming container $CURRENT_NAME (${ID:0:12}) to $NAME"
+      if ! "$DOCKER_BIN" container rename "$ID" "$NAME" >/dev/null; then
+        dokku_log_warn "Failed to rename container $CURRENT_NAME (${ID:0:12})"
+        dokku_log_info2_quiet "Start $APP (${ID:0:12}) container output:"
+        dokku_container_log_verbose_quiet "$ID"
+        dokku_log_info2_quiet "End $APP (${ID:0:12}) container output"
+      fi
     fi
   done
   shopt -u nullglob