cloudposse · Cerebrovinny · Mar 11, 2025 · Mar 11, 2025 · Mar 11, 2025 · Mar 11, 2025
@@ -9,7 +9,7 @@
 	"regexp"
 	"strings"
 
-	"github.com/charmbracelet/log"
+	log "github.com/charmbracelet/log"
 	"github.com/elewis787/boa"
 	"github.com/spf13/cobra"
 
@@ -80,21 +80,7 @@
 }
 
 func setupLogger(atmosConfig *schema.AtmosConfiguration) {
-	switch atmosConfig.Logs.Level {
-	case "Trace":
-		log.SetLevel(log.DebugLevel)
-	case "Debug":
-		log.SetLevel(log.DebugLevel)
-	case "Info":
-		log.SetLevel(log.InfoLevel)
-	case "Warning":
-		log.SetLevel(log.WarnLevel)
-	case "Off":
-		log.SetLevel(math.MaxInt32)
-	default:
-		log.SetLevel(log.InfoLevel)
-	}
-
+	// Determine output writer based on configuration.
 	var output io.Writer
 
 	switch atmosConfig.Logs.File {
@@ -113,12 +99,44 @@
 		output = logFile
 	}
 
-	log.SetOutput(output)
+	atmosLogger := logger.NewAtmosLogger(output)
+
+	// Set the global log instance to our styled logger.
+	log.SetDefault(atmosLogger)
+
+	// Set the appropriate log level based on configuration.
+	switch atmosConfig.Logs.Level {
+	case "Trace":
+		atmosLogger.SetLevel(logger.AtmosTraceLevel)
+	case "Debug":
+		atmosLogger.SetLevel(log.DebugLevel)
+	case "Info":
+		atmosLogger.SetLevel(log.InfoLevel)
+	case "Warning":
+		atmosLogger.SetLevel(log.WarnLevel)
+	case "Error":
+		atmosLogger.SetLevel(log.ErrorLevel)
+	case "Off":
+		atmosLogger.SetLevel(math.MaxInt32)
+	default:
+		atmosLogger.SetLevel(log.InfoLevel)
+	}
+
 	if _, err := logger.ParseLogLevel(atmosConfig.Logs.Level); err != nil {
 		//nolint:all // The reason to escape this is because it is expected to fail fast. The reason for ignoring all is because we also get a lint error to execute defer logFile.Close() before this but that is not required
 		log.Fatal(err)
 	}
-	log.Debug("Set", "logs-level", log.GetLevel(), "logs-file", atmosConfig.Logs.File)
+	// Use the log level from config directly for consistent output
+	logLevelStr := strings.ToLower(atmosConfig.Logs.Level)
+	if logLevelStr == "" {
+		logLevelStr = "info" // Default value if not specified
+	}
+
+	if strings.ToLower(atmosConfig.Logs.Level) == "trace" {
+		log.Log(logger.AtmosTraceLevel, "Set", "logs-level", logLevelStr, "logs-file", atmosConfig.Logs.File)
-		log.Log(logger.AtmosTraceLevel, "Set", "logs-level", logLevelStr, "logs-file", atmosConfig.Logs.File)
+		log.Trace("Set", "logs-level", logLevelStr, "logs-file", atmosConfig.Logs.File)
-		log.Log(logger.AtmosTraceLevel, "Set", "logs-level", logLevelStr, "logs-file", atmosConfig.Logs.File)
+		log.Trace("Set", "logs-level", logLevelStr, "logs-file", atmosConfig.Logs.File)
+	} else {
+		log.Debug("Set", "logs-level", logLevelStr, "logs-file", atmosConfig.Logs.File)
+	}
 }
 
 
8000
// Execute adds all child commands to the root command and sets flags appropriately.

@@ -22,7 +22,7 @@
 	IncludeDependents           bool
 	IncludeSettings             bool
 	IncludeSpaceliftAdminStacks bool
-	Logger                      *l.Logger
+	Logger                      *l.AtmosLogger
 	OutputFile                  string
 	Ref                         string
 	RepoPath                    string
@@ -48,7 +48,7 @@
 	if err != nil {
 		return DescribeAffectedCmdArgs{}, err
 	}
-	logger, err := l.NewLoggerFromCliConfig(atmosConfig)
+	logger, err := l.NewLoggerFromCliConfig(&atmosConfig)
 	if err != nil {
 		return DescribeAffectedCmdArgs{}, err
 	}
@@ -151,7 +151,7 @@
 
 	if verbose {
 		atmosConfig.Logs.Level = u.LogLevelTrace
-		err := logger.SetLogLevel(l.LogLevelTrace)
+		err := logger.SetLogLevel(l.AtmosTraceLevel)
 		if err != nil {
 			return DescribeAffectedCmdArgs{}, err
 		}

@@ -12,7 +12,7 @@
 
 type ProLockUnlockCmdArgs struct {
 	Component string
-	Logger    *l.Logger
+	Logger    *l.AtmosLogger
 	Stack     string
 }
 
@@ -39,7 +39,7 @@
 		return ProLockUnlockCmdArgs{}, err
 	}
 
-	logger, err := l.NewLoggerFromCliConfig(atmosConfig)
+	logger, err := l.NewLoggerFromCliConfig(&atmosConfig)
 	if err != nil {
 		return ProLockUnlockCmdArgs{}, err
 	}