Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -277,10 +277,15 @@ func init() {
// Run this before we do anything to set up the loglevel
rootCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {
// Read env vars
logLevel = viper.GetString("log")
lvl, err := log.ParseLevel(logLevel)
if err != nil {
log.WithFields(log.Fields{"level": logLevel, "err": err}).Errorf("couldn't parse `log` config, defaulting to `info`")
var lvl log.Level

if logLevel != "" {
lvl, err = log.ParseLevel(logLevel)
if err != nil {
log.WithFields(log.Fields{"level": logLevel, "err": err}).Errorf("couldn't parse `log` config, defaulting to `info`")
lvl = log.InfoLevel
}
} else {
lvl = log.InfoLevel
}
log.SetLevel(lvl)
Expand Down