Skip to content

fix(cli): apply log-filter to debug logs only #8751

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

Merged
merged 1 commit into from
Jul 26, 2023
Merged

fix(cli): apply log-filter to debug logs only #8751

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 11 additions & 9 deletions cli/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,14 +1751,14 @@ func IsLocalhost(host string) bool {
return host == "localhost" || host == "127.0.0.1" || host == "::1"
}

var _ slog.Sink = &filterSink{}
var _ slog.Sink = &debugFilterSink{}

type filterSink struct {
type debugFilterSink struct {
next []slog.Sink
re *regexp.Regexp
}

func (f *filterSink) compile(res []string) error {
func (f *debugFilterSink) compile(res []string) error {
if len(res) == 0 {
return nil
}
Expand All @@ -1779,17 +1779,19 @@ func (f *filterSink) compile(res []string) error {
return nil
}

func (f *filterSink) LogEntry(ctx context.Context, ent slog.SinkEntry) {
logName := strings.Join(ent.LoggerNames, ".")
if f.re != nil && !f.re.MatchString(logName) {
return
func (f *debugFilterSink) LogEntry(ctx context.Context, ent slog.SinkEntry) {
if ent.Level == slog.LevelDebug {
logName := strings.Join(ent.LoggerNames, ".")
if f.re != nil && !f.re.MatchString(logName) {
return
}
}
for _, sink := range f.next {
sink.LogEntry(ctx, ent)
}
}

func (f *filterSink) Sync() {
func (f *debugFilterSink) Sync() {
for _, sink := range f.next {
sink.Sync()
}
Expand Down Expand Up @@ -1844,7 +1846,7 @@ func BuildLogger(inv *clibase.Invocation, cfg *codersdk.DeploymentValues) (slog.
return slog.Logger{}, nil, xerrors.New("no loggers provided")
}

filter := &filterSink{next: sinks}
filter := &debugFilterSink{next: sinks}

err = filter.compile(cfg.Logging.Filter.Value())
if err != nil {
Expand Down