Merge pull request #6984 from dokku/fix-container-output-logging
Correctly pass around arguments when displaying container log output
This commit is contained in:
2 files changed
+6
-6
No files matched your search
@@ -109,17 +109,17 @@ trigger-scheduler-docker-local-check-deploy() {
|
|||||||
|
|
||||||
checks_check_deploy_cleanup() {
|
checks_check_deploy_cleanup() {
|
||||||
declare desc="print container output"
|
declare desc="print container output"
|
||||||
declare CID="$1" TMP_FILE="$2"
|
declare APP="$1" DOKKU_APP_CONTAINER_TYPE="$2" CID="$3" CONTAINER_INDEX="$4" TMP_FILE="$5"
|
||||||
|
|
||||||
if [[ $CID ]]; then
|
if [[ $CID ]]; then
|
||||||
dokku_log_info2_quiet "Start of $APP container output ($DOKKU_APP_CONTAINER_TYPE.$CONTAINER_INDEX)"
|
dokku_log_info2_quiet "Start of $APP container output (${CID:0:12} $DOKKU_APP_CONTAINER_TYPE.$CONTAINER_INDEX)"
|
||||||
dokku_container_log_verbose_quiet "$CID"
|
dokku_container_log_verbose_quiet "$CID"
|
||||||
dokku_log_info2_quiet "End of $APP container output ($DOKKU_APP_CONTAINER_TYPE.$CONTAINER_INDEX)"
|
dokku_log_info2_quiet "End of $APP container output (${CID:0:12} $DOKKU_APP_CONTAINER_TYPE.$CONTAINER_INDEX)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm -rf "$TMP_FILE" >/dev/null
|
rm -rf "$TMP_FILE" >/dev/null
|
||||||
}
|
}
|
||||||
trap "checks_check_deploy_cleanup $DOKKU_APP_CONTAINER_ID $TMP_APP_JSON_OUTPUT" RETURN INT TERM EXIT
|
trap "checks_check_deploy_cleanup $APP $DOKKU_APP_CONTAINER_TYPE $DOKKU_APP_CONTAINER_ID $CONTAINER_INDEX $TMP_APP_JSON_OUTPUT" RETURN INT TERM EXIT
|
||||||
|
|
||||||
local DOKKU_DEFAULT_CHECKS_WAIT="${DOKKU_DEFAULT_CHECKS_WAIT:-10}"
|
local DOKKU_DEFAULT_CHECKS_WAIT="${DOKKU_DEFAULT_CHECKS_WAIT:-10}"
|
||||||
content="$(docker-container-healthchecker add "$DOKKU_APP_CONTAINER_TYPE" --app-json "$TMP_APP_JSON_OUTPUT" --if-empty --pretty --uptime "$DOKKU_DEFAULT_CHECKS_WAIT")"
|
content="$(docker-container-healthchecker add "$DOKKU_APP_CONTAINER_TYPE" --app-json "$TMP_APP_JSON_OUTPUT" --if-empty --pretty --uptime "$DOKKU_DEFAULT_CHECKS_WAIT")"
|
||||||
|
|||||||
@@ -70,9 +70,9 @@ trigger-scheduler-docker-local-core-post-deploy() {
|
|||||||
dokku_log_verbose_quiet "Renaming container $CURRENT_NAME (${ID:0:12}) to $NAME"
|
dokku_log_verbose_quiet "Renaming container $CURRENT_NAME (${ID:0:12}) to $NAME"
|
||||||
if ! "$DOCKER_BIN" container rename "$ID" "$NAME" >/dev/null; then
|
if ! "$DOCKER_BIN" container rename "$ID" "$NAME" >/dev/null; then
|
||||||
dokku_log_warn "Failed to rename container $CURRENT_NAME (${ID:0:12})"
|
dokku_log_warn "Failed to rename container $CURRENT_NAME (${ID:0:12})"
|
||||||
dokku_log_info2_quiet "Start $APP (${ID:0:12}) container output:"
|
dokku_log_info2_quiet "Start $APP container output (${ID:0:12} $NAME)"
|
||||||
dokku_container_log_verbose_quiet "$ID"
|
dokku_container_log_verbose_quiet "$ID"
|
||||||
dokku_log_info2_quiet "End $APP (${ID:0:12}) container output"
|
dokku_log_info2_quiet "End $APP container output (${ID:0:12} $NAME)"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|||||||
Reference in new issue
Block a user