github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: cleanup log output for failure case

Browse Source 
Also mark DOKKU_DISABLE_ANSI_PREFIX_REMOVAL as deprecated (it will be removed in 0.23.0 and no prefixes will be removed at that time).
This commit is contained in:
Jose Diaz-Gonzalez
2020-11-28 03:32:11 -05:00
parent bd261e6847
commit bde77dbf78
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/appendices/0.22.0-migration-guide.md
View File

@@ -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)). - 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 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. - 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 ## Removals

2
plugins/app-json/appjson.go
View File

@@ -138,6 +138,7 @@ func getDokkuAppShell(appName string) string {
} }
func executeScript(appName string, imageTag string, phase string) error { func executeScript(appName string, imageTag string, phase string) error {
common.LogInfo1(fmt.Sprintf("Checking for %s task", phase))
image, err := common.GetDeployingAppImageName(appName, imageTag, "") image, err := common.GetDeployingAppImageName(appName, imageTag, "")
if err != nil { if err != nil {
common.LogFail(err.Error()) common.LogFail(err.Error())
@@ -156,6 +157,7 @@ func executeScript(appName string, imageTag string, phase string) error {
} }
if command == "" { if command == "" {
common.LogVerbose(fmt.Sprintf("No %s task found, skipping", phase))
return nil return nil
} }

4
plugins/common/functions
View File

@@ -137,14 +137,14 @@ dokku_log_exit() {
dokku_log_fail_quiet() { dokku_log_fail_quiet() {
declare desc="log fail formatter" declare desc="log fail formatter"
if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then
echo "$@" 1>&2 echo " ! $@" 1>&2
fi fi
exit 1 exit 1
} }
dokku_log_fail() { dokku_log_fail() {
declare desc="log fail formatter" declare desc="log fail formatter"
echo "$@" 1>&2 echo " ! $@" 1>&2
exit 1 exit 1
} }

4
plugins/common/log.go
View File

@@ -9,7 +9,7 @@ import (
// LogFail is the failure log formatter // LogFail is the failure log formatter
// prints text to stderr and exits with status 1 // prints text to stderr and exits with status 1
func LogFail(text string) { func LogFail(text string) {
fmt.Fprintln(os.Stderr, fmt.Sprintf("FAILED: %s", text)) fmt.Fprintln(os.Stderr, fmt.Sprintf(" ! %s", text))
os.Exit(1) os.Exit(1)
} }
@@ -17,7 +17,7 @@ func LogFail(text string) {
// prints text to stderr and exits with status 1 // prints text to stderr and exits with status 1
func LogFailQuiet(text string) { func LogFailQuiet(text string) {
if os.Getenv("DOKKU_QUIET_OUTPUT") == "" { 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) os.Exit(1)
} }