Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLI log level should override env var log level #31

Merged
merged 1 commit into from
Mar 25, 2022
Merged

CLI log level should override env var log level #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 8 additions & 12 deletions internal/config/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,7 @@ func (cfg *Application) parseConfigValues() error {
// ... this will be an enhancement for later
cfg.Log.LevelOpt = logrus.PanicLevel
} else {
if cfg.Log.Level != "" {
if cfg.CliOptions.Verbosity > 0 {
return fmt.Errorf("cannot explicitly set log level (cfg file or env var) and use -v flag together")
}

lvl, err := logrus.ParseLevel(strings.ToLower(cfg.Log.Level))
if err != nil {
return fmt.Errorf("bad log level configured (%q): %w", cfg.Log.Level, err)
}
// set the log level explicitly
cfg.Log.LevelOpt = lvl
} else {
if cfg.CliOptions.Verbosity > 0 {
// set the log level implicitly
switch v := cfg.CliOptions.Verbosity; {
case v == 1:
Expand All @@ -120,6 +109,13 @@ func (cfg *Application) parseConfigValues() error {
cfg.Log.LevelOpt = logrus.WarnLevel
}
cfg.Log.Level = cfg.Log.LevelOpt.String()
} else {
lvl, err := logrus.ParseLevel(strings.ToLower(cfg.Log.Level))
if err != nil {
return fmt.Errorf("bad log level configured (%q): %w", cfg.Log.Level, err)
}
// set the log level explicitly
cfg.Log.LevelOpt = lvl
}
}

Expand Down