From e006db6ed9897be9556f02c7e6e2f67367997965 Mon Sep 17 00:00:00 2001 From: Alex Sharov Date: Sat, 9 Dec 2023 13:42:07 +0700 Subject: [PATCH] evm cli: no logs if --json (#8925) --- cmd/evm/runner.go | 12 +++++++----- cmd/evm/staterunner.go | 10 +++++++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index 04d68baaf6b..cde453423ba 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -119,10 +119,12 @@ func timedExec(bench bool, execFunc func() ([]byte, uint64, error)) (output []by } func runCmd(ctx *cli.Context) error { - log.Root().SetHandler(log.LvlFilterHandler(log.LvlInfo, log.StderrHandler)) - //glogger := log.NewGlogHandler(log.StreamHandler(os.Stderr, log.TerminalFormat(false))) - //glogger.Verbosity(log.Lvl(ctx.GlobalInt(VerbosityFlag.Name))) - //log.Root().SetHandler(glogger) + machineFriendlyOutput := ctx.Bool(MachineFlag.Name) + if machineFriendlyOutput { + log.Root().SetHandler(log.DiscardHandler()) + } else { + log.Root().SetHandler(log.LvlFilterHandler(log.LvlInfo, log.StderrHandler)) + } logconfig := &logger.LogConfig{ DisableMemory: ctx.Bool(DisableMemoryFlag.Name), DisableStack: ctx.Bool(DisableStackFlag.Name), @@ -140,7 +142,7 @@ func runCmd(ctx *cli.Context) error { receiver = libcommon.BytesToAddress([]byte("receiver")) genesisConfig *types.Genesis ) - if ctx.Bool(MachineFlag.Name) { + if machineFriendlyOutput { tracer = logger.NewJSONLogger(logconfig, os.Stdout) } else if ctx.Bool(DebugFlag.Name) { debugLogger = logger.NewStructLogger(logconfig) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index db787e76da7..151da18661f 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -57,8 +57,12 @@ type StatetestResult struct { } func stateTestCmd(ctx *cli.Context) error { - // Configure the go-ethereum logger - log.Root().SetHandler(log.LvlFilterHandler(log.LvlDebug, log.StderrHandler)) + machineFriendlyOutput := ctx.Bool(MachineFlag.Name) + if machineFriendlyOutput { + log.Root().SetHandler(log.DiscardHandler()) + } else { + log.Root().SetHandler(log.LvlFilterHandler(log.LvlInfo, log.StderrHandler)) + } // Configure the EVM logger config := &logger.LogConfig{ @@ -70,7 +74,7 @@ func stateTestCmd(ctx *cli.Context) error { cfg := vm.Config{ Debug: ctx.Bool(DebugFlag.Name) || ctx.Bool(MachineFlag.Name), } - if ctx.Bool(MachineFlag.Name) { + if machineFriendlyOutput { cfg.Tracer = logger.NewJSONLogger(config, os.Stderr) } else if ctx.Bool(DebugFlag.Name) { cfg.Tracer = logger.NewStructLogger(config)