fix(cli/server): apply log filter to log message as well as name

ammario · ammario · commit 4ee6fd50a683 · 2023-08-21T21:15:42.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -1845,7 +1845,7 @@ func (f *debugFilterSink) compile(res []string) error {
 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) {
+		if f.re != nil && !f.re.MatchString(logName) && !f.re.MatchString(ent.Message) {
 			return
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1845,7 +1845,7 @@ func (f *debugFilterSink) compile(res []string) error {`
`1845`	`1845`	`func (f *debugFilterSink) LogEntry(ctx context.Context, ent slog.SinkEntry) {`
`1846`	`1846`	`if ent.Level == slog.LevelDebug {`
`1847`	`1847`	`logName := strings.Join(ent.LoggerNames, ".")`
`1848`		`- if f.re != nil && !f.re.MatchString(logName) {`
	`1848`	`+ if f.re != nil && !f.re.MatchString(logName) && !f.re.MatchString(ent.Message) {`
`1849`	`1849`	`return`
`1850`	`1850`	`}`
`1851`	`1851`	`}`