improve logger

Signed-off-by: Markus Blaschke <[email protected]>

Author: mblaschke

log/slogger/logger.go

@@ -4,11 +4,9 @@ import (
 	"fmt"
 	"io"
 	"log/slog"
-	"os"
 	"strings"
 
 	"github.com/lmittmann/tint"
-	isatty "github.com/mattn/go-isatty"
 )
 
 type LoggerOptionFunc func(*Options)
@@ -60,7 +58,7 @@ func WithSourceMode(mode SourceMode) LoggerOptionFunc {
 	return func(opt *Options) {
 		opt.SourceMode = mode
 		if mode != SourceModeNone {
-			opt.HandlerOptions.AddSource = true
+			opt.AddSource = true
 		}
 	}
 }
@@ -80,6 +78,12 @@ func WithFormat(mode FormatMode) LoggerOptionFunc {
 	}
 }
 
+func WithColor(mode ColorMode) LoggerOptionFunc {
+	return func(opt *Options) {
+		opt.SetColorMode(mode)
+	}
+}
+
 func WithTime(v bool) LoggerOptionFunc {
 	return func(opt *Options) {
 		opt.ShowTime = v
@@ -101,7 +105,7 @@ func NewCliLogger(w io.Writer, opts ...LoggerOptionFunc) *Logger {
 		SetSourceMode(SourceModeNone).
 		SetFormat(FormatModeLogfmt).
 		SetShowTime(false).
-		SetColor(isatty.IsTerminal(os.Stdout.Fd()))
+		SetColorMode(ColorModeAuto)
 
 	return newLoggerHandler(w, loggerOptions, opts...)
 }
@@ -121,6 +125,7 @@ func newLoggerHandler(w io.Writer, handlerOpts *Options, opts ...LoggerOptionFun
 				ReplaceAttr: handlerOpts.ReplaceAttr,
 				Level:       handlerOpts.Level,
 				AddSource:   handlerOpts.SourceMode != SourceModeNone,
+				NoColor:     false,
 			}
 
 			if !handlerOpts.ShowTime {

log/slogger/options.go

@@ -3,7 +3,11 @@ package slogger
 import (
 	"fmt"
 	"log/slog"
+	"os"
 	"strings"
+
+	"github.com/lmittmann/tint"
+	isatty "github.com/mattn/go-isatty"
 )
 
 type (
@@ -47,8 +51,15 @@ func (o *Options) SetShowTime(mode bool) *Options {
 	return o
 }
 
-func (o *Options) SetColor(mode bool) *Options {
-	o.Color = mode
+func (o *Options) SetColorMode(mode ColorMode) *Options {
+	o.Color = false
+
+	switch strings.ToLower(string(mode)) {
+	case "", "auto":
+		o.Color = isatty.IsTerminal(os.Stderr.Fd())
+	case "1", "y", "yes", "true", "enable", "enabled", "on":
+		o.Color = true
+	}
 	return o
 }
 
@@ -60,6 +71,10 @@ func NewReplaceAttr(opts *Options, callback func(groups []string, a slog.Attr) s
 			level := a.Value.Any().(slog.Level)
 			if l, exists := levelNames[level]; exists {
 				a.Value = slog.StringValue(l.text)
+
+				if opts.Color && l.color > 0 {
+					a = tint.Attr(l.color, a)
+				}
 			} else {
 				a.Value = slog.StringValue(level.String())
 			}
@@ -85,6 +100,13 @@ func NewReplaceAttr(opts *Options, callback func(groups []string, a slog.Attr) s
 			}
 		}
 
+		if opts.Color {
+			// if val is error, color it
+			if _, isErr := a.Value.Any().(error); isErr {
+				a = tint.Attr(ColorError, a)
+			}
+		}
+
 		if callback != nil {
 			a = callback(groups, a)
 		}

log/slogger/slogger.go

@@ -11,6 +11,7 @@ import (
 type (
 	FormatMode string
 	SourceMode string
+	ColorMode  string
 )
 
 const (
@@ -22,13 +23,22 @@ const (
 	SourceModeFile  SourceMode = "file"
 	SourceModeFull  SourceMode = "full"
 
+	ColorModeDisabled ColorMode = "disabled"
+	ColorModeEnabled  ColorMode = "enabled"
+	ColorModeAuto     ColorMode = "auto"
+
 	LevelTrace = slog.Level(-8)
 	LevelDebug = slog.LevelDebug
 	LevelInfo  = slog.LevelInfo
 	LevelWarn  = slog.LevelWarn
 	LevelError = slog.LevelError
 	LevelFatal = slog.Level(12)
 	LevelPanic = slog.Level(255)
+
+	ColorError   = 1
+	ColorWarning = 3
+	ColorInfo    = 2
+	ColorDebug   = 5
 )
 
 type (
@@ -37,19 +47,20 @@ type (
 	}
 
 	logLevel struct {
-		text string
+		text  string
+		color uint8
 	}
 )
 
 var (
 	levelNames = map[slog.Leveler]logLevel{
-		LevelTrace: {text: "TRACE"},
-		LevelDebug: {text: "DEBUG"},
-		LevelInfo:  {text: "INFO"},
-		LevelWarn:  {text: "WARN"},
-		LevelError: {text: "ERROR"},
-		LevelFatal: {text: "FATAL"},
-		LevelPanic: {text: "PANIC"},
+		LevelTrace: {text: "TRACE", color: ColorDebug},
+		LevelDebug: {text: "DEBUG", color: ColorDebug},
+		LevelInfo:  {text: "INFO", color: ColorInfo},
+		LevelWarn:  {text: "WARN", color: ColorWarning},
+		LevelError: {text: "ERROR", color: ColorError},
+		LevelFatal: {text: "FATAL", color: ColorError},
+		LevelPanic: {text: "PANIC", color: ColorError},
 	}
 )