Merge pull request #3848 from dokku/logging-fixes
Minor logging changes
This commit is contained in:
4 files changed
+13
-5
No files matched your search
@@ -55,7 +55,7 @@ cmd-apps-report-single() {
|
|||||||
if [[ "$use_echo" ]]; then
|
if [[ "$use_echo" ]]; then
|
||||||
echo "not deployed"
|
echo "not deployed"
|
||||||
else
|
else
|
||||||
dokku_log_exit "not deployed"
|
dokku_log_exit_quiet "not deployed"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ apps_exists_cmd() {
|
|||||||
if ! apps_exists "$APP"; then
|
if ! apps_exists "$APP"; then
|
||||||
dokku_log_fail "App does not exist"
|
dokku_log_fail "App does not exist"
|
||||||
fi
|
fi
|
||||||
dokku_log_info1 "App already exists"
|
dokku_log_info1 "App exists"
|
||||||
}
|
}
|
||||||
|
|
||||||
apps_exists_cmd "$@"
|
apps_exists_cmd "$@"
|
||||||
@@ -130,9 +130,7 @@ dokku_log_exit_quiet() {
|
|||||||
|
|
||||||
dokku_log_exit() {
|
dokku_log_exit() {
|
||||||
declare desc="log exit formatter"
|
declare desc="log exit formatter"
|
||||||
if [[ -z "$DOKKU_QUIET_OUTPUT" ]]; then
|
echo "$@" 1>&2
|
||||||
echo "$@" 1>&2
|
|
||||||
fi
|
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -150,6 +148,11 @@ dokku_log_fail() {
|
|||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dokku_log_stderr() {
|
||||||
|
declare desc="log stderr formatter"
|
||||||
|
echo "$@" 1>&2
|
||||||
|
}
|
||||||
|
|
||||||
dokku_log_event() {
|
dokku_log_event() {
|
||||||
declare desc="log dokku events"
|
declare desc="log dokku events"
|
||||||
logger -t dokku-event -i -- "$@"
|
logger -t dokku-event -i -- "$@"
|
||||||
|
|||||||
@@ -54,3 +54,8 @@ func LogVerboseQuiet(text string) {
|
|||||||
func LogWarn(text string) {
|
func LogWarn(text string) {
|
||||||
fmt.Fprintln(os.Stderr, fmt.Sprintf(" ! %s", text))
|
fmt.Fprintln(os.Stderr, fmt.Sprintf(" ! %s", text))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// LogStderr is the stderr log formatter
|
||||||
|
func LogStderr(text string) {
|
||||||
|
fmt.Fprintln(os.Stderr, text)
|
||||||
|
}
|
||||||
Reference in new issue
Block a user