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 log package JSONHandler wrapper

Browse source
This commit is contained in:
Jared Wasinger 2023-11-09 19:13:11 +08:00
parent bd684ceac7
commit dad6ef06fe
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/debug/flags.go
View file

@ -234,9 +234,9 @@ func Setup(ctx *cli.Context) error {
case ctx.Bool(logjsonFlag.Name): case ctx.Bool(logjsonFlag.Name):
// Retain backwards compatibility with `--log.json` flag if `--log.format` not set // Retain backwards compatibility with `--log.json` flag if `--log.format` not set
defer log.Warn("The flag '--log.json' is deprecated, please use '--log.format=json' instead") defer log.Warn("The flag '--log.json' is deprecated, please use '--log.format=json' instead")
handler = slog.NewJSONHandler(output, nil) handler = log.JSONHandler(output)
case logFmtFlag == "json": case logFmtFlag == "json":
handler = slog.NewJSONHandler(output, nil) handler = log.JSONHandler(output)
case logFmtFlag == "logfmt": case logFmtFlag == "logfmt":
handler = log.LogfmtHandler(output) handler = log.LogfmtHandler(output)
case logFmtFlag == "", logFmtFlag == "terminal": case logFmtFlag == "", logFmtFlag == "terminal":

2
log/handler.go
View file

@ -169,7 +169,7 @@ func (l *leveler) Level() slog.Level {
return l.minLevel return l.minLevel
} }
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: builtinReplace,
}) })