Merge pull request #31 from open-edge-platform/loglevel-commandline-override-option

Fix --log-level flag not working

Author: magerstam

cmd/image-composer/main.go

@@ -39,15 +39,21 @@ func main() {
 		os.Exit(1)
 	}
 
-	// Handle global log level override
-	if logLevel != "" {
-		globalConfig.Logging.Level = logLevel
-	}
-
 	// Setup logger with configured level
 	_, cleanup := utils.InitWithLevel(globalConfig.Logging.Level)
 	defer cleanup()
 
+	// Create and execute root command
+	rootCmd := createRootCommand()
+
+	// Handle log level override after flag parsing
+	rootCmd.PersistentPreRun = func(cmd *cobra.Command, args []string) {
+		if logLevel != "" {
+			globalConfig.Logging.Level = logLevel
+			utils.SetLogLevel(logLevel)
+		}
+	}
+
 	// Log configuration info
 	logger := utils.Logger()
 	if configFilePath != "" {
@@ -58,8 +64,6 @@ func main() {
 			globalConfig.Workers, globalConfig.CacheDir, globalConfig.WorkDir, globalConfig.TempDir)
 	}
 
-	// Create and execute root command
-	rootCmd := createRootCommand()
 	if err := rootCmd.Execute(); err != nil {
 		os.Exit(1)
 	}
@@ -78,7 +82,7 @@ from different Operating System Vendors (OSVs).`,
 	// Add global flags
 	rootCmd.PersistentFlags().StringVar(&configFile, "config", "",
 		"Path to configuration file")
-	rootCmd.PersistentFlags().StringVar(&logLevel, "log-level", globalConfig.Logging.Level,
+	rootCmd.PersistentFlags().StringVar(&logLevel, "log-level", "",
 		"Log level (debug, info, warn, error)")
 
 	// Add all subcommands

internal/debutils/resolver.go

@@ -354,7 +354,9 @@ func compareDebianVersions(a, b string) (int, error) {
 	splitEpoch := func(ver string) (epoch int, rest string) {
 		parts := strings.SplitN(ver, ":", 2)
 		if len(parts) == 2 {
-			fmt.Sscanf(parts[0], "%d", &epoch)
+			if _, err := fmt.Sscanf(parts[0], "%d", &epoch); err != nil {
+				epoch = 0
+			}
 			rest = parts[1]
 		} else {
 			epoch = 0

internal/utils/logger/logger.go

@@ -25,6 +25,7 @@ func (n nopSyncer) Sync() error {
 var (
 	sugarLogger *zap.SugaredLogger
 	baseLogger  *zap.Logger
+	atomicLevel zap.AtomicLevel // This allows dynamic level changes
 	once        sync.Once
 )
 
@@ -49,15 +50,18 @@ func initLoggerWithLevel(level string) {
 		zapLevel = zapcore.InfoLevel // Default to info
 	}
 
+	// Create atomic level for dynamic changes
+	atomicLevel = zap.NewAtomicLevelAt(zapLevel)
+
 	cfg := zap.NewDevelopmentConfig()
-	cfg.Level = zap.NewAtomicLevelAt(zapLevel)
+	cfg.Level = atomicLevel
 	cfg.EncoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
 	cfg.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
 	cfg.EncoderConfig.EncodeCaller = zapcore.ShortCallerEncoder
 
 	encoder := zapcore.NewConsoleEncoder(cfg.EncoderConfig)
 	writer := nopSyncer{os.Stderr}
-	core := zapcore.NewCore(encoder, writer, cfg.Level)
+	core := zapcore.NewCore(encoder, writer, atomicLevel)
 
 	opts := []zap.Option{
 		zap.AddCaller(),
@@ -95,6 +99,11 @@ func InitWithLevel(level string) (*zap.SugaredLogger, func()) {
 		initLoggerWithLevel(level)
 	})
 
+	// If logger already exists, just change the level dynamically
+	if atomicLevel.Enabled(zapcore.InfoLevel) { // Check if atomicLevel is initialized
+		SetLogLevel(level)
+	}
+
 	if baseLogger == nil {
 		panic("logger initialization failed: baseLogger is nil")
 	}
@@ -119,13 +128,25 @@ func With(args ...interface{}) *zap.SugaredLogger {
 	return Logger().With(args...)
 }
 
-// SetLogLevel dynamically changes the log level
+// SetLogLevel dynamically changes the log level without re-initializing the logger
 func SetLogLevel(level string) {
-	if baseLogger != nil {
-		// For now, we'll just log a message about the level change
-		// Note: Dynamic level changing requires reconfiguring the logger core
-		// which is more complex than this simple implementation
-		sugarLogger.Infof("Log level change requested to: %s", level)
-		sugarLogger.Infof("Note: Restart application to apply new log level")
+	if atomicLevel == (zap.AtomicLevel{}) {
+		return // Not initialized yet
+	}
+
+	var zapLevel zapcore.Level
+	switch strings.ToLower(level) {
+	case "debug":
+		zapLevel = zapcore.DebugLevel
+	case "info":
+		zapLevel = zapcore.InfoLevel
+	case "warn", "warning":
+		zapLevel = zapcore.WarnLevel
+	case "error":
+		zapLevel = zapcore.ErrorLevel
+	default:
+		zapLevel = zapcore.InfoLevel
 	}
+
+	atomicLevel.SetLevel(zapLevel)
 }