diff --git a/docs/appendices/0.22.0-migration-guide.md b/docs/appendices/0.22.0-migration-guide.md index bcef67a11..96441874d 100644 --- a/docs/appendices/0.22.0-migration-guide.md +++ b/docs/appendices/0.22.0-migration-guide.md @@ -10,6 +10,7 @@ - Process type names specified in Procfile may no longer use characters not valid in DNS Label Names ([RFC 1123](https://tools.ietf.org/html/rfc1123)). - The minimum Docker version is now 17.05.0. - The `common.GetDeployingAppImageName()` function now returns an `error` as the second return argument instead of calling `common.LogFail()` internally. +- Setting `DOKKU_DISABLE_ANSI_PREFIX_REMOVAL` is deprecated; Dokku 0.23.0 will avoid removing the `remote:` ansi prefix entirely. No warning will be added in this release. ## Removals diff --git a/plugins/app-json/appjson.go b/plugins/app-json/appjson.go index f9dc5bd98..c8ea7b763 100644 --- a/plugins/app-json/appjson.go +++ b/plugins/app-json/appjson.go @@ -138,6 +138,7 @@ func getDokkuAppShell(appName string) string { } func executeScript(appName string, imageTag string, phase string) error { + common.LogInfo1(fmt.Sprintf("Checking for %s task", phase)) image, err := common.GetDeployingAppImageName(appName, imageTag, "") if err != nil { common.LogFail(err.Error()) @@ -156,6 +157,7 @@ func executeScript(appName string, imageTag string, phase string) error { } if command == "" { + common.LogVerbose(fmt.Sprintf("No %s task found, skipping", phase)) return nil } diff --git a/plugins/common/functions b/plugins/common/functions index 51263f24b..8b0b06905 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -137,14 +137,14 @@ dokku_log_exit() { dokku_log_fail_quiet() { declare desc="log fail formatter" if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then - echo "$@" 1>&2 + echo " ! $@" 1>&2 fi exit 1 } dokku_log_fail() { declare desc="log fail formatter" - echo "$@" 1>&2 + echo " ! $@" 1>&2 exit 1 } diff --git a/plugins/common/log.go b/plugins/common/log.go index 3619bbe65..fe1193e1e 100644 --- a/plugins/common/log.go +++ b/plugins/common/log.go @@ -9,7 +9,7 @@ import ( // LogFail is the failure log formatter // prints text to stderr and exits with status 1 func LogFail(text string) { - fmt.Fprintln(os.Stderr, fmt.Sprintf("FAILED: %s", text)) + fmt.Fprintln(os.Stderr, fmt.Sprintf(" ! %s", text)) os.Exit(1) } @@ -17,7 +17,7 @@ func LogFail(text string) { // prints text to stderr and exits with status 1 func LogFailQuiet(text string) { if os.Getenv("DOKKU_QUIET_OUTPUT") == "" { - fmt.Fprintln(os.Stderr, fmt.Sprintf("FAILED: %s", text)) + fmt.Fprintln(os.Stderr, fmt.Sprintf(" ! %s", text)) } os.Exit(1) }