Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always log with text format by default #1096

Merged
merged 2 commits into from
Jan 3, 2024
Merged

Always log with text format by default #1096

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
336543a
Always log with text format by default
mgyucht Jan 2, 2024
8d6f424
fix;
mgyucht Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions cmd/root/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,11 @@ func (f *logFlags) makeLogHandler(opts slog.HandlerOptions) (slog.Handler, error
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),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Level: opts.Level,
ReplaceAttr: opts.ReplaceAttr,
}), nil
default:
return nil, fmt.Errorf("invalid log output mode: %s", f.output)
}
Expand Down
Loading