Skip to content

log: add Handler getter to Logger interface #1960

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
Apr 1, 2024
Merged

log: add Handler getter to Logger interface #1960

Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion internal/testlog/testlog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,11 @@ func LoggerWithHandler(t *testing.T, handler slog.Handler) log.Logger {
}
}

func (l *logger) Write(level slog.Level, msg string, ctx ...any) {}
func (l *logger) Handler() slog.Handler {
return l.l.Handler()
}

func (l *logger) Write(level slog.Level, msg string, ctx ...interface{}) {}

func (l *logger) Enabled(ctx context.Context, level slog.Level) bool {
return l.l.Enabled(ctx, level)
Expand Down
7 changes: 7 additions & 0 deletions log/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ type Logger interface {

// Enabled reports whether l emits log records at the given context and level.
Enabled(ctx context.Context, level slog.Level) bool

// Handler returns the underlying handler of the inner logger.
Handler() slog.Handler
}

type logger struct {
Expand All @@ -149,6 +152,10 @@ func NewLogger(h slog.Handler) Logger {
}
}

func (l *logger) Handler() slog.Handler {
return l.inner.Handler()
}

// write logs a message at the specified level:
func (l *logger) Write(level slog.Level, msg string, attrs ...any) {
if !l.inner.Enabled(context.Background(), level) {
Expand Down