From 6ba58e97a9bd6340f52868bb7f69a98a568648f7 Mon Sep 17 00:00:00 2001 From: Jared Wasinger Date: Wed, 22 Nov 2023 21:45:02 +0800 Subject: [PATCH] remove Inner method from Logger interface --- internal/testlog/testlog.go | 4 ---- log/logger.go | 10 ---------- log/root.go | 4 +++- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/internal/testlog/testlog.go b/internal/testlog/testlog.go index fdf537a5bc..68b9fb19f8 100644 --- a/internal/testlog/testlog.go +++ b/internal/testlog/testlog.go @@ -98,10 +98,6 @@ func LoggerWithHandler(t *testing.T, handler slog.Handler) log.Logger { } } -func (l *logger) Inner() *slog.Logger { - return l.l.Inner() -} - func (l *logger) Write(level slog.Level, msg string, ctx ...interface{}) {} func (l *logger) Trace(msg string, ctx ...interface{}) { diff --git a/log/logger.go b/log/logger.go index 903b329f1f..3e227745ad 100644 --- a/log/logger.go +++ b/log/logger.go @@ -105,8 +105,6 @@ func LevelString(l slog.Level) string { // A Logger writes key/value pairs to a Handler type Logger interface { - // TODO: add WithGroup()? - // With returns a new Logger that has this logger's attributes plus the given attributes With(ctx ...interface{}) Logger @@ -134,9 +132,6 @@ type Logger interface { // Crit logs a message at the crit level with context key/value pairs, and exits Crit(msg string, ctx ...interface{}) - // Inner returns the underlying slog logger that is wrapped - Inner() *slog.Logger - // Write logs a message at the specified level Write(level slog.Level, msg string, attrs ...any) } @@ -152,11 +147,6 @@ func NewLogger(h slog.Handler) Logger { } } -// Inner returns the underlying slog logger that -func (l *logger) Inner() *slog.Logger { - return l.inner -} - // 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) { diff --git a/log/root.go b/log/root.go index 2d7ad6cefe..71040fff47 100644 --- a/log/root.go +++ b/log/root.go @@ -17,7 +17,9 @@ func init() { // SetDefault sets the default global logger func SetDefault(l Logger) { root.Store(l) - slog.SetDefault(l.Inner()) + if lg, ok := l.(*logger); ok { + slog.SetDefault(lg.inner) + } } // Root returns the root logger