Fix log level setting from cli/config/env var (#143)

metal-toolbox · Nov 14, 2023 · 1b0ecc4 · 1b0ecc4
1 parent 081d23b
commit 1b0ecc4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -51,7 +51,7 @@ func Execute() {
 }
 
 func init() {
-	rootCmd.PersistentFlags().StringVar(&logLevel, "log-level", "info", "set logging level - debug, trace")
+	rootCmd.PersistentFlags().StringVar(&logLevel, "log-level", "", "set logging level - info, debug, trace")
 	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config-file", "c", "", "Syncer configuration file")
 	rootCmd.PersistentFlags().StringVar(&inventoryKind, "inventory", "serverservice", "Inventory to publish firmwares.")
 }
diff --git a/internal/app/app.go b/internal/app/app.go
@@ -48,7 +48,12 @@ func New(ctx context.Context, inventoryKind types.InventoryKind, cfgFile, logLev
 		return nil, err
 	}
 
-	switch types.LogLevel(logLevel) {
+	// CLI parameter takes precedence over config and env vars
+	if logLevel != "" {
+		app.Config.LogLevel = logLevel
+	}
+
+	switch types.LogLevel(app.Config.LogLevel) {
 	case types.LogLevelDebug:
 		app.Logger.Level = logrus.DebugLevel
 	case types.LogLevelTrace:
@@ -183,8 +188,6 @@ func (a *App) LoadConfiguration(cfgFile string, inventoryKind types.InventoryKin
 		}
 	}
 
-	a.v.SetDefault("log.level", "info")
-
 	if err := a.envBindVars(); err != nil {
 		return errors.Wrap(config.ErrConfig, "env var bind error: "+err.Error())
 	}