From 53a45b72efd49c81dba81bbdc8e6bb41e75ccd75 Mon Sep 17 00:00:00 2001 From: ppacher Date: Tue, 7 Apr 2020 10:52:07 +0200 Subject: [PATCH] Only set initial log level if flag is set --- log/flags.go | 2 +- log/logging.go | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/log/flags.go b/log/flags.go index 0fcfb75..eb01929 100644 --- a/log/flags.go +++ b/log/flags.go @@ -8,6 +8,6 @@ var ( ) func init() { - flag.StringVar(&logLevelFlag, "log", "info", "set log level to [trace|debug|info|warning|error|critical]") + flag.StringVar(&logLevelFlag, "log", "", "set log level to [trace|debug|info|warning|error|critical]") flag.StringVar(&pkgLogLevelsFlag, "plog", "", "set log level of packages: database=trace,notifications=debug") } diff --git a/log/logging.go b/log/logging.go index d28039f..7d606a3 100644 --- a/log/logging.go +++ b/log/logging.go @@ -137,12 +137,14 @@ func Start() (err error) { logBuffer = make(chan *logLine, 1024) - initialLogLevel := ParseLevel(logLevelFlag) - if initialLogLevel > 0 { + if logLevelFlag != "" { + initialLogLevel := ParseLevel(logLevelFlag) + if initialLogLevel == 0 { + fmt.Fprintf(os.Stderr, "log warning: invalid log level \"%s\", falling back to level info\n", logLevelFlag) + initialLogLevel = InfoLevel + } + SetLogLevel(initialLogLevel) - } else { - err = fmt.Errorf("log warning: invalid log level \"%s\", falling back to level info", logLevelFlag) - fmt.Fprintf(os.Stderr, "%s\n", err.Error()) } // get and set file loglevels