diff options
| author | Paul Buetow <35781042+pbuetow@users.noreply.github.com> | 2020-12-27 19:46:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-27 19:46:24 +0000 |
| commit | 495e9f38220a6d448b15882a235e7a9c21f21d18 (patch) | |
| tree | 5b59cade83108c1855d07f1f869a0dcb3b9f0907 /internal/io/logger/logger.go | |
| parent | b4db37d8cbae8f0c3dec289b2e1b0cfe83731415 (diff) | |
| parent | 2c7bdd09e8b7c58d98d631e32a24e4bd34d5bec9 (diff) | |
Merge pull request #16 from snonux/develop
Multiple minor enhancements.
Diffstat (limited to 'internal/io/logger/logger.go')
| -rw-r--r-- | internal/io/logger/logger.go | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/internal/io/logger/logger.go b/internal/io/logger/logger.go index b7db0a7..4254eef 100644 --- a/internal/io/logger/logger.go +++ b/internal/io/logger/logger.go @@ -72,12 +72,15 @@ type buf struct { func Start(ctx context.Context, mode Modes) { Mode = mode - if Mode.Nothing { + switch { + case Mode.Nothing: return - } - - if Mode.Trace { + case Mode.Quiet: + Mode.Trace = false + Mode.Debug = false + case Mode.Trace: Mode.Debug = true + default: } strategy := logStrategy() @@ -87,7 +90,7 @@ func Start(ctx context.Context, mode Modes) { case DailyStrategy: _, err := os.Stat(config.Common.LogDir) Mode.logToFile = !os.IsNotExist(err) - Mode.logToStdout = !Mode.Server || Mode.Debug || Mode.Trace + Mode.logToStdout = !Mode.Server || Mode.Debug || Mode.Trace || Mode.Quiet case StdoutStrategy: fallthrough default: @@ -131,11 +134,14 @@ func Info(args ...interface{}) string { // Warn message logging. func Warn(args ...interface{}) string { - if Mode.Server { - return log(serverStr, warnStr, args) + if !Mode.Quiet { + if Mode.Server { + return log(serverStr, warnStr, args) + } + return log(clientStr, warnStr, args) } - return log(clientStr, warnStr, args) + return "" } // Error message logging. @@ -242,7 +248,7 @@ func log(what string, severity string, args []interface{}) string { message := strings.Join(messages, "|") write(what, severity, message) - return message + return fmt.Sprintf("%s|%s", severity, message) } // Raw message logging. |