logger: use key names from opts #271
@ -20,17 +20,20 @@ var (
|
|||||||
fatalValue = slog.StringValue("fatal")
|
fatalValue = slog.StringValue("fatal")
|
||||||
)
|
)
|
||||||
|
|
||||||
var renameAttr = func(_ []string, a slog.Attr) slog.Attr {
|
func (s *slogLogger) renameAttr(_ []string, a slog.Attr) slog.Attr {
|
||||||
switch a.Key {
|
switch a.Key {
|
||||||
case slog.SourceKey:
|
case slog.SourceKey:
|
||||||
source := a.Value.Any().(*slog.Source)
|
source := a.Value.Any().(*slog.Source)
|
||||||
a.Value = slog.StringValue(source.File + ":" + strconv.Itoa(source.Line))
|
a.Value = slog.StringValue(source.File + ":" + strconv.Itoa(source.Line))
|
||||||
a.Key = "caller"
|
a.Key = s.opts.SourceKey
|
||||||
case slog.TimeKey:
|
case slog.TimeKey:
|
||||||
a.Key = "timestamp"
|
a.Key = s.opts.TimeKey
|
||||||
|
case slog.MessageKey:
|
||||||
|
a.Key = s.opts.MessageKey
|
||||||
case slog.LevelKey:
|
case slog.LevelKey:
|
||||||
level := a.Value.Any().(slog.Level)
|
level := a.Value.Any().(slog.Level)
|
||||||
lvl := slogToLoggerLevel(level)
|
lvl := slogToLoggerLevel(level)
|
||||||
|
a.Key = s.opts.LevelKey
|
||||||
switch {
|
switch {
|
||||||
case lvl < DebugLevel:
|
case lvl < DebugLevel:
|
||||||
a.Value = traceValue
|
a.Value = traceValue
|
||||||
@ -76,7 +79,7 @@ func (s *slogLogger) Clone(opts ...options.Option) Logger {
|
|||||||
|
|
||||||
l.leveler = new(slog.LevelVar)
|
l.leveler = new(slog.LevelVar)
|
||||||
handleOpt := &slog.HandlerOptions{
|
handleOpt := &slog.HandlerOptions{
|
||||||
ReplaceAttr: renameAttr,
|
ReplaceAttr: s.renameAttr,
|
||||||
Level: l.leveler,
|
Level: l.leveler,
|
||||||
AddSource: true,
|
AddSource: true,
|
||||||
}
|
}
|
||||||
@ -105,7 +108,7 @@ func (s *slogLogger) Attrs(attrs ...interface{}) Logger {
|
|||||||
nl.leveler.Set(s.leveler.Level())
|
nl.leveler.Set(s.leveler.Level())
|
||||||
|
|
||||||
handleOpt := &slog.HandlerOptions{
|
handleOpt := &slog.HandlerOptions{
|
||||||
ReplaceAttr: renameAttr,
|
ReplaceAttr: nl.renameAttr,
|
||||||
Level: s.leveler,
|
Level: s.leveler,
|
||||||
AddSource: true,
|
AddSource: true,
|
||||||
}
|
}
|
||||||
@ -132,7 +135,7 @@ func (s *slogLogger) Init(opts ...options.Option) error {
|
|||||||
|
|
||||||
s.leveler = new(slog.LevelVar)
|
s.leveler = new(slog.LevelVar)
|
||||||
handleOpt := &slog.HandlerOptions{
|
handleOpt := &slog.HandlerOptions{
|
||||||
ReplaceAttr: renameAttr,
|
ReplaceAttr: s.renameAttr,
|
||||||
Level: s.leveler,
|
Level: s.leveler,
|
||||||
AddSource: true,
|
AddSource: true,
|
||||||
}
|
}
|
||||||
|
4
logger/wrapper/wrapper.go
Normal file
4
logger/wrapper/wrapper.go
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
package wrapper
|
||||||
|
|
||||||
|
func NewWrapper(l logger.Logger) logger.Logger {
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user