From dad6ef06feabe1386b343959e0d67df8f4971066 Mon Sep 17 00:00:00 2001 From: Jared Wasinger Date: Thu, 9 Nov 2023 19:13:11 +0800 Subject: [PATCH] use log package JSONHandler wrapper --- internal/debug/flags.go | 4 ++-- log/handler.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/debug/flags.go b/internal/debug/flags.go index a7c87a930a..cc507685ad 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -234,9 +234,9 @@ func Setup(ctx *cli.Context) error { case ctx.Bool(logjsonFlag.Name): // 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") - handler = slog.NewJSONHandler(output, nil) + handler = log.JSONHandler(output) case logFmtFlag == "json": - handler = slog.NewJSONHandler(output, nil) + handler = log.JSONHandler(output) case logFmtFlag == "logfmt": handler = log.LogfmtHandler(output) case logFmtFlag == "", logFmtFlag == "terminal": diff --git a/log/handler.go b/log/handler.go index 5249201ee8..f43df0392b 100644 --- a/log/handler.go +++ b/log/handler.go @@ -169,7 +169,7 @@ func (l *leveler) Level() slog.Level { return l.minLevel } -func JsonHandler(wr io.Writer) slog.Handler { +func JSONHandler(wr io.Writer) slog.Handler { return slog.NewJSONHandler(wr, &slog.HandlerOptions{ ReplaceAttr: builtinReplace, })