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

cmd/geth: in logtest command, reset root logger before starting test output to clear field padding map. make LogFormatFlag public from internal/debug package.

Browse source
This commit is contained in:
Jared Wasinger 2023-11-13 23:30:06 +08:00
parent 3ab42db894
commit 8632783dcb
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmd/geth/logtestcmd_active.go
View file

@ -23,9 +23,11 @@ import (
"fmt" "fmt"
"math" "math"
"math/big" "math/big"
"os"
"time" "time"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/internal/debug"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/holiman/uint256" "github.com/holiman/uint256"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
@ -49,6 +51,11 @@ func (c customQuotedStringer) String() string {
// logTest is an entry point which spits out some logs. This is used by testing // logTest is an entry point which spits out some logs. This is used by testing
// to verify expected outputs // to verify expected outputs
func logTest(ctx *cli.Context) error { func logTest(ctx *cli.Context) error {
// if log is set to output terminal format, reset root logger to clear field padding map
if !ctx.IsSet(debug.LogFormatFlag.Name) || ctx.String(debug.LogFormatFlag.Name) == "terminal" {
log.SetDefault(log.NewLogger(log.TerminalHandler(os.Stdout, false)))
}
{ // big.Int { // big.Int
ba, _ := new(big.Int).SetString("111222333444555678999", 10) // "111,222,333,444,555,678,999" ba, _ := new(big.Int).SetString("111222333444555678999", 10) // "111,222,333,444,555,678,999"
bb, _ := new(big.Int).SetString("-111222333444555678999", 10) // "-111,222,333,444,555,678,999" bb, _ := new(big.Int).SetString("-111222333444555678999", 10) // "-111,222,333,444,555,678,999"

8
internal/debug/flags.go
View file

@ -66,7 +66,7 @@ var (
Hidden: true, Hidden: true,
Category: flags.LoggingCategory, Category: flags.LoggingCategory,
} }
logFormatFlag = &cli.StringFlag{ LogFormatFlag = &cli.StringFlag{
Name: "log.format", Name: "log.format",
Usage: "Log format to use (json|logfmt|terminal)", Usage: "Log format to use (json|logfmt|terminal)",
Category: flags.LoggingCategory, Category: flags.LoggingCategory,
@ -151,7 +151,7 @@ var Flags = []cli.Flag{
logVmoduleFlag, logVmoduleFlag,
vmoduleFlag, vmoduleFlag,
logjsonFlag, logjsonFlag,
logFormatFlag, LogFormatFlag,
logFileFlag, logFileFlag,
logRotateFlag, logRotateFlag,
logMaxSizeMBsFlag, logMaxSizeMBsFlag,
@ -186,7 +186,7 @@ func Setup(ctx *cli.Context) error {
fileOutput io.Writer fileOutput io.Writer
terminalOutput = io.Writer(os.Stderr) terminalOutput = io.Writer(os.Stderr)
output io.Writer output io.Writer
logFmtFlag = ctx.String(logFormatFlag.Name) logFmtFlag = ctx.String(LogFormatFlag.Name)
) )
var ( var (
logFile = ctx.String(logFileFlag.Name) logFile = ctx.String(logFileFlag.Name)
@ -252,7 +252,7 @@ func Setup(ctx *cli.Context) error {
handler = log.TerminalHandler(output, useColor) handler = log.TerminalHandler(output, useColor)
default: default:
// Unknown log format specified // Unknown log format specified
return fmt.Errorf("unknown log format: %v", ctx.String(logFormatFlag.Name)) return fmt.Errorf("unknown log format: %v", ctx.String(LogFormatFlag.Name))
} }
glogger = log.NewGlogHandler(handler) glogger = log.NewGlogHandler(handler)