unistack-org/micro
4
0
Fork 3
Code Issues 18 Pull Requests 1 Actions Packages Projects Releases 265 Wiki Activity

logger: use key names from opts #271

Merged
vtolstov merged 2 commits from log into master 2023-10-17 01:05:57 +03:00
Conversation 0 Commits 2 Files Changed 1 +13 -6
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d4e6fb26f7 - Show all commits

15
logger/slog.go
View File

@ -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
View File

@ -0,0 +1,4 @@
package wrapper
func NewWrapper(l logger.Logger) logger.Logger {
}