From 336543adc7275d3d37185b8ff4b5a1c641c05442 Mon Sep 17 00:00:00 2001 From: Miles Yucht Date: Tue, 2 Jan 2024 13:04:15 +0100 Subject: [PATCH 1/2] Always log with text format by default --- cmd/root/logger.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/cmd/root/logger.go b/cmd/root/logger.go index 494b28fc3d..cd938174db 100644 --- a/cmd/root/logger.go +++ b/cmd/root/logger.go @@ -32,16 +32,11 @@ func (f *logFlags) makeLogHandler(opts slog.HandlerOptions) (slog.Handler, error case flags.OutputJSON: return slog.NewJSONHandler(f.file.Writer(), &opts), nil case flags.OutputText: - w := f.file.Writer() - if cmdio.IsTTY(w) { - return handler.NewFriendlyHandler(w, &handler.Options{ - Color: true, - Level: opts.Level, - ReplaceAttr: opts.ReplaceAttr, - }), nil - } - return slog.NewTextHandler(w, &opts), nil - + return handler.NewFriendlyHandler(w, &handler.Options{ + Color: cmdio.IsTTY(w), + Level: opts.Level, + ReplaceAttr: opts.ReplaceAttr, + }), nil default: return nil, fmt.Errorf("invalid log output mode: %s", f.output) } From 8d6f4248bf1acddbe5c9c31bc6f6126eb8605b50 Mon Sep 17 00:00:00 2001 From: Miles Yucht Date: Tue, 2 Jan 2024 13:09:26 +0100 Subject: [PATCH 2/2] fix; --- cmd/root/logger.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/root/logger.go b/cmd/root/logger.go index cd938174db..48cb99a370 100644 --- a/cmd/root/logger.go +++ b/cmd/root/logger.go @@ -32,6 +32,7 @@ func (f *logFlags) makeLogHandler(opts slog.HandlerOptions) (slog.Handler, error case flags.OutputJSON: return slog.NewJSONHandler(f.file.Writer(), &opts), nil case flags.OutputText: + w := f.file.Writer() return handler.NewFriendlyHandler(w, &handler.Options{ Color: cmdio.IsTTY(w), Level: opts.Level,