From 77257c484f0d2bf72ef70795d5732812b8fbecb0 Mon Sep 17 00:00:00 2001
From: Michael Hobbs <michaelshanehobbs@gmail.com>
Date: Fri, 20 Mar 2015 08:29:35 -0700
Subject: [PATCH] show logs on deploy success and failure. closes #1044

---
 plugins/checks/check-deploy | 39 ++++++++++++++++---------------------
 plugins/common/functions    | 20 +++++++++++++++++++
 tests/test_deploy           |  2 --
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/plugins/checks/check-deploy b/plugins/checks/check-deploy
index 37367a538de..861d90de93c 100755
--- a/plugins/checks/check-deploy
+++ b/plugins/checks/check-deploy
@@ -54,40 +54,36 @@ WAIT="${DOKKU_CHECKS_WAIT:-5}"
 # Wait this many seconds (default 30) for each response.
 TIMEOUT="${DOKKU_CHECKS_TIMEOUT:-30}"
 
-
 # try to copy CHECKS from container if not in APP dir & quit gracefully if it doesn't exist
 # docker cp exits with status 1 when run as non-root user when it tries to chown the file
 # after successfully copying the file. Thus, we suppress stderr.
 # ref: https://github.com/dotcloud/docker/issues/3986
 TMPDIR=$(mktemp -d /tmp/CHECKS.XXXXX)
 docker cp $DOKKU_APP_CONTAINER_ID:/app/CHECKS $TMPDIR 2> /dev/null || true
-if [[ ! -s "${TMPDIR}/CHECKS" ]] ; then
-    dokku_log_verbose "CHECKS file not found in container: running simple container check..."
-    rm -rf $TMPDIR
-
-    # simple default check to see if the container stuck around
-    # for more thorough checks, create a CHECKS file
-    DOKKU_DEFAULT_WAIT=$((WAIT+TIMEOUT))
-    dokku_log_info1 "Waiting for $DOKKU_DEFAULT_WAIT seconds ..."
-    sleep $DOKKU_DEFAULT_WAIT
-
-    docker ps -q --no-trunc | grep -q "$DOKKU_APP_CONTAINER_ID" || dokku_log_fail "App container failed to start!!"
-    dokku_log_info1 "Default check successful!" && exit 0
-fi
-
 
 FILENAME=${TMPDIR}/CHECKS
 
 cleanup() {
   rm -rf $TMPDIR
-  if [[ $DOKKU_TRACE ]] ; then
-    dokku_log_info1   "Begin server log ..."
-    docker logs $DOKKU_APP_CONTAINER_ID
-    dokku_log_info1   "End server log\n"
-  fi
+  dokku_log_info2_quiet             "$APP container output:"
+  dokku_container_log_verbose_quiet $DOKKU_APP_CONTAINER_ID
+  dokku_log_info2_quiet             "end $APP container output"
 }
 trap cleanup EXIT
 
+if [[ ! -s "${TMPDIR}/CHECKS" ]] ; then
+  dokku_log_verbose "CHECKS file not found in container: running simple container check..."
+  rm -rf $TMPDIR
+
+  # simple default check to see if the container stuck around
+  # for more thorough checks, create a CHECKS file
+  DOKKU_DEFAULT_WAIT=$((WAIT+TIMEOUT))
+  dokku_log_info1 "Waiting for $DOKKU_DEFAULT_WAIT seconds ..."
+  sleep $DOKKU_DEFAULT_WAIT
+
+  docker ps -q --no-trunc | grep -q "$DOKKU_APP_CONTAINER_ID" || dokku_log_fail "App container failed to start!!"
+  dokku_log_info1 "Default container check successful!" && exit 0
+fi
 
 # Reads name/value pairs, sets the WAIT and TIMEOUT variables
 exec < "$FILENAME"
@@ -150,6 +146,7 @@ while read CHECK_URL EXPECTED ; do
   # And how we formulate the CURL request
   CURL_ARGS="$CURL_OPTIONS $URL_PROTOCOL://$DOKKU_APP_LISTEN_IP:$DOKKU_APP_LISTEN_PORT$URL_PATHNAME $HEADERS"
 
+  dokku_log_verbose "CHECKS expected result:"
   dokku_log_verbose "$LOG_URL => \"$EXPECTED\""
   [[ $DOKKU_TRACE ]] && dokku_log_verbose "$ curl $CURL_ARGS"
 
@@ -167,6 +164,4 @@ while read CHECK_URL EXPECTED ; do
   fi
 done
 
-
 dokku_log_info1 "All checks successful!"
-
diff --git a/plugins/common/functions b/plugins/common/functions
index 7c0aa071a0d..da87b1300bd 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -69,6 +69,14 @@ dokku_col_log_msg_quiet() {
   fi
 }
 
+dokku_log_verbose_quiet() {
+  if [[ -z "$DOKKU_QUIET_OUTPUT" ]];then
+    echo "       $@"
+  else
+    return 0
+  fi
+}
+
 dokku_log_verbose() {
   echo "       $@"
 }
@@ -82,6 +90,18 @@ dokku_log_fail() {
   exit 1
 }
 
+dokku_container_log_verbose_quiet() {
+  CID=$1;
+  shift
+
+  OIFS=$IFS
+  IFS=$'\n'
+  for line in $(docker logs $CID 2>&1); do
+    dokku_log_verbose_quiet "$line"
+  done
+  IFS=$OIFS
+}
+
 verify_app_name() {
   local APP="$1"
   [[ ! -d "$DOKKU_ROOT/$APP" ]] && dokku_log_fail "App $APP does not exist"
diff --git a/tests/test_deploy b/tests/test_deploy
index 5ec2d6eb728..1f6cf474326 100755
--- a/tests/test_deploy
+++ b/tests/test_deploy
@@ -11,7 +11,6 @@ destroy_app(){
 
 failed(){
   echo "************ $1 failed ************"
-  dokku logs $REPO
   destroy_app
   exit 1
 }
@@ -47,5 +46,4 @@ else
   fi
 fi
 
-dokku logs $REPO
 destroy_app