28e7371701
This PR replaces Geth's logger package (a fork of [log15](https://github.com/inconshreveable/log15)) with an implementation using slog, a logging library included as part of the Go standard library as of Go1.21. Main changes are as follows: * removes any log handlers that were unused in the Geth codebase. * Json, logfmt, and terminal formatters are now slog handlers. * Verbosity level constants are changed to match slog constant values. Internal translation is done to make this opaque to the user and backwards compatible with existing `--verbosity` and `--vmodule` options. * `--log.backtraceat` and `--log.debug` are removed. The external-facing API is largely the same as the existing Geth logger. Logger method signatures remain unchanged. A small semantic difference is that a `Handler` can only be set once per `Logger` and not changed dynamically. This just means that a new logger must be instantiated every time the handler of the root logger is changed. ---- For users of the `go-ethereum/log` module. If you were using this module for your own project, you will need to change the initialization. If you previously did ```golang log.Root().SetHandler(log.LvlFilterHandler(log.LvlInfo, log.StreamHandler(os.Stderr, log.TerminalFormat(true)))) ``` You now instead need to do ```golang log.SetDefault(log.NewLogger(log.NewTerminalHandlerWithLevel(os.Stderr, log.LevelInfo, true))) ``` See more about reasoning here: https://github.com/ethereum/go-ethereum/issues/28558#issuecomment-1820606613
70 lines
1.9 KiB
Go
70 lines
1.9 KiB
Go
// Copyright 2020 The go-ethereum Authors
|
|
// This file is part of go-ethereum.
|
|
//
|
|
// go-ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// go-ethereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package main
|
|
|
|
import (
|
|
"os"
|
|
|
|
"github.com/ethereum/go-ethereum/cmd/devp2p/internal/v4test"
|
|
"github.com/ethereum/go-ethereum/internal/utesting"
|
|
"github.com/ethereum/go-ethereum/log"
|
|
"github.com/urfave/cli/v2"
|
|
)
|
|
|
|
var (
|
|
testPatternFlag = &cli.StringFlag{
|
|
Name: "run",
|
|
Usage: "Pattern of test suite(s) to run",
|
|
}
|
|
testTAPFlag = &cli.BoolFlag{
|
|
Name: "tap",
|
|
Usage: "Output TAP",
|
|
}
|
|
// These two are specific to the discovery tests.
|
|
testListen1Flag = &cli.StringFlag{
|
|
Name: "listen1",
|
|
Usage: "IP address of the first tester",
|
|
Value: v4test.Listen1,
|
|
}
|
|
testListen2Flag = &cli.StringFlag{
|
|
Name: "listen2",
|
|
Usage: "IP address of the second tester",
|
|
Value: v4test.Listen2,
|
|
}
|
|
)
|
|
|
|
func runTests(ctx *cli.Context, tests []utesting.Test) error {
|
|
// Filter test cases.
|
|
if ctx.IsSet(testPatternFlag.Name) {
|
|
tests = utesting.MatchTests(tests, ctx.String(testPatternFlag.Name))
|
|
}
|
|
// Disable logging unless explicitly enabled.
|
|
if !ctx.IsSet("verbosity") && !ctx.IsSet("vmodule") {
|
|
log.SetDefault(log.NewLogger(log.DiscardHandler()))
|
|
}
|
|
// Run the tests.
|
|
var run = utesting.RunTests
|
|
if ctx.Bool(testTAPFlag.Name) {
|
|
run = utesting.RunTAP
|
|
}
|
|
results := run(tests, os.Stdout)
|
|
if utesting.CountFailures(results) > 0 {
|
|
os.Exit(1)
|
|
}
|
|
return nil
|
|
}
|