Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

evm cli: no logs if --json #8925

Merged
merged 2 commits into from
Dec 9, 2023
Merged

evm cli: no logs if --json #8925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66ca0a5
save
AskAlexSharov Dec 7, 2023
a86185d
save
AskAlexSharov Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions cmd/evm/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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)
Expand Down
10 changes: 7 additions & 3 deletions cmd/evm/staterunner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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)
Expand Down
Loading