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

log: undo New-renaming for handler constructors

Browse source
This commit is contained in:
Martin Holst Swende 2023-12-05 10:10:54 +01:00
parent eacee243a3
commit 4d38c842bf
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/debug/flags.go
View file

@ -241,11 +241,11 @@ 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 = log.NewJSONHandler(output) handler = log.JSONHandler(output)
case logFmtFlag == "json": case logFmtFlag == "json":
handler = log.NewJSONHandler(output) handler = log.JSONHandler(output)
case logFmtFlag == "logfmt": case logFmtFlag == "logfmt":
handler = log.NewLogfmtHandler(output) handler = log.LogfmtHandler(output)
case logFmtFlag == "", logFmtFlag == "terminal": case logFmtFlag == "", logFmtFlag == "terminal":
useColor := (isatty.IsTerminal(os.Stderr.Fd()) || isatty.IsCygwinTerminal(os.Stderr.Fd())) && os.Getenv("TERM") != "dumb" useColor := (isatty.IsTerminal(os.Stderr.Fd()) || isatty.IsCygwinTerminal(os.Stderr.Fd())) && os.Getenv("TERM") != "dumb"
if useColor { if useColor {

8
log/handler.go
View file

@ -113,18 +113,18 @@ func (l *leveler) Level() slog.Level {
return l.minLevel return l.minLevel
} }
// NewJSONHandler returns a handler which prints records in JSON format. // JSONHandler returns a handler which prints records in JSON format.
func NewJSONHandler(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: builtinReplaceJSON, ReplaceAttr: builtinReplaceJSON,
}) })
} }
// NewLogfmtHandler returns a handler which prints records in logfmt format, an easy machine-parseable but human-readable // LogfmtHandler returns a handler which prints records in logfmt format, an easy machine-parseable but human-readable
// format for key/value pairs. // format for key/value pairs.
// //
// For more details see: http://godoc.org/github.com/kr/logfmt // For more details see: http://godoc.org/github.com/kr/logfmt
func NewLogfmtHandler(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: builtinReplaceLogfmt, ReplaceAttr: builtinReplaceLogfmt,
}) })

4
log/logger_test.go
View file

@ -62,12 +62,12 @@ func BenchmarkTerminalHandler(b *testing.B) {
benchmarkLogger(b, l) benchmarkLogger(b, l)
} }
func BenchmarkLogfmtHandler(b *testing.B) { func BenchmarkLogfmtHandler(b *testing.B) {
l := NewLogger(NewLogfmtHandler(io.Discard)) l := NewLogger(LogfmtHandler(io.Discard))
benchmarkLogger(b, l) benchmarkLogger(b, l)
} }
func BenchmarkJSONHandler(b *testing.B) { func BenchmarkJSONHandler(b *testing.B) {
l := NewLogger(NewJSONHandler(io.Discard)) l := NewLogger(JSONHandler(io.Discard))
benchmarkLogger(b, l) benchmarkLogger(b, l)
} }