forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use separate time formats for logfmt/json handlers

Browse source
This commit is contained in:
Jared Wasinger 2023-11-17 17:48:59 +08:00
parent 3ee196069e
commit a110d6aa1e
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
log/handler.go
View file

@ -147,7 +147,7 @@ func (l *leveler) Level() slog.Level {
func JSONHandler(wr io.Writer) slog.Handler { func JSONHandler(wr io.Writer) slog.Handler {
return slog.NewJSONHandler(wr, &slog.HandlerOptions{ return slog.NewJSONHandler(wr, &slog.HandlerOptions{
ReplaceAttr: builtinReplace, ReplaceAttr: builtinReplaceJSON,
}) })
} }
@ -157,7 +157,7 @@ func JSONHandler(wr io.Writer) slog.Handler {
// For more details see: http://godoc.org/github.com/kr/logfmt // For more details see: http://godoc.org/github.com/kr/logfmt
func LogfmtHandler(wr io.Writer) slog.Handler { func LogfmtHandler(wr io.Writer) slog.Handler {
return slog.NewTextHandler(wr, &slog.HandlerOptions{ return slog.NewTextHandler(wr, &slog.HandlerOptions{
ReplaceAttr: builtinReplace, ReplaceAttr: builtinReplaceLogfmt,
}) })
} }
@ -165,16 +165,28 @@ func LogfmtHandler(wr io.Writer) slog.Handler {
// records which are less than or equal to the specified verbosity level. // records which are less than or equal to the specified verbosity level.
func LogfmtHandlerWithLevel(wr io.Writer, level slog.Level) slog.Handler { func LogfmtHandlerWithLevel(wr io.Writer, level slog.Level) slog.Handler {
return slog.NewTextHandler(wr, &slog.HandlerOptions{ return slog.NewTextHandler(wr, &slog.HandlerOptions{
ReplaceAttr: builtinReplace, ReplaceAttr: builtinReplaceLogfmt,
Level: &leveler{level}, Level: &leveler{level},
}) })
} }
func builtinReplace(_ []string, attr slog.Attr) slog.Attr { func builtinReplaceLogfmt(_ []string, attr slog.Attr) slog.Attr {
return builtinReplace(nil, attr, true)
}
func builtinReplaceJSON(_ []string, attr slog.Attr) slog.Attr {
return builtinReplace(nil, attr, false)
}
func builtinReplace(_ []string, attr slog.Attr, logfmt bool) slog.Attr {
switch attr.Key { switch attr.Key {
case slog.TimeKey: case slog.TimeKey:
if attr.Value.Kind() == slog.KindTime { if attr.Value.Kind() == slog.KindTime {
if logfmt {
return slog.String("t", attr.Value.Time().Format(timeFormat)) return slog.String("t", attr.Value.Time().Format(timeFormat))
} else {
return slog.Attr{"t", attr.Value}
}
} }
case slog.LevelKey: case slog.LevelKey:
if l, ok := attr.Value.Any().(slog.Level); ok { if l, ok := attr.Value.Any().(slog.Level); ok {
@ -185,7 +197,9 @@ func builtinReplace(_ []string, attr slog.Attr) slog.Attr {
switch v := attr.Value.Any().(type) { switch v := attr.Value.Any().(type) {
case time.Time: case time.Time:
attr = slog.Any(attr.Key, v.Format(timeFormat)) if logfmt {
attr = slog.String(attr.Key, v.Format(timeFormat))
}
case *big.Int: case *big.Int:
if v == nil { if v == nil {
attr.Value = slog.StringValue("<nil>") attr.Value = slog.StringValue("<nil>")