Skip to content

Commit

Permalink
remove old slog error field
Browse files Browse the repository at this point in the history
  • Loading branch information
jrobsonchase committed Jan 22, 2024
1 parent d0d5d36 commit f02d2fb
Showing 1 changed file with 2 additions and 20 deletions.
22 changes: 2 additions & 20 deletions log/slog/adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ package slog

import (
"context"
"fmt"

"log/slog"
)
Expand Down Expand Up @@ -34,23 +33,6 @@ func NewLogger(l *slog.Logger) *Logger {
}

func (l *Logger) Log(ctx context.Context, level LogLevel, msg string, data map[string]interface{}) {
var logError error
// The slog `Error` method takes an error field. Look through our log
// args and see if one was provided, and trim it out.
if level == LogLevelError {
var errorKey string
for k, v := range data {
if err, ok := v.(error); ok {
logError = err
errorKey = k
break
}
}
if logError != nil {
delete(data, errorKey)
}
}

logArgs := make([]interface{}, 0, len(data))
for k, v := range data {
logArgs = append(logArgs, k, v)
Expand All @@ -66,8 +48,8 @@ func (l *Logger) Log(ctx context.Context, level LogLevel, msg string, data map[s
case LogLevelWarn:
l.inner.Warn(msg, logArgs...)
case LogLevelError:
l.inner.Error(msg, logError, logArgs...)
l.inner.Error(msg, logArgs...)
default:
l.inner.Error(msg, fmt.Errorf("INVALID LOG LEVEL: %d", level), logArgs...)
l.inner.Error(msg, append(logArgs, "INVALID_LOG_LEVEL", level)...)
}
}

0 comments on commit f02d2fb

Please sign in to comment.