forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-16 18:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #742 from gzliudan/fix-pr734

Browse source 
use global function when cli v1
This commit is contained in:
Daniel Liu 2024-11-21 17:58:56 +08:00 committed by GitHub
commit 962be21184
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/evm/runner.go
View file

@ -71,9 +71,9 @@ func runCmd(ctx *cli.Context) error {
logconfig := &vm.LogConfig{ logconfig := &vm.LogConfig{
EnableMemory: !ctx.GlobalBool(DisableMemoryFlag.Name), EnableMemory: !ctx.GlobalBool(DisableMemoryFlag.Name),
DisableStack: ctx.GlobalBool(DisableStackFlag.Name), DisableStack: ctx.GlobalBool(DisableStackFlag.Name),
DisableStorage: ctx.Bool(DisableStorageFlag.Name), DisableStorage: ctx.GlobalBool(DisableStorageFlag.Name),
EnableReturnData: !ctx.Bool(DisableReturnDataFlag.Name), EnableReturnData: !ctx.GlobalBool(DisableReturnDataFlag.Name),
Debug: ctx.Bool(DebugFlag.Name), Debug: ctx.GlobalBool(DebugFlag.Name),
} }
var ( var (

4
cmd/evm/staterunner.go
View file

@ -52,8 +52,8 @@ func stateTestCmd(ctx *cli.Context) error {
config := &vm.LogConfig{ config := &vm.LogConfig{
EnableMemory: !ctx.GlobalBool(DisableMemoryFlag.Name), EnableMemory: !ctx.GlobalBool(DisableMemoryFlag.Name),
DisableStack: ctx.GlobalBool(DisableStackFlag.Name), DisableStack: ctx.GlobalBool(DisableStackFlag.Name),
DisableStorage: ctx.Bool(DisableStorageFlag.Name), DisableStorage: ctx.GlobalBool(DisableStorageFlag.Name),
EnableReturnData: !ctx.Bool(DisableReturnDataFlag.Name), EnableReturnData: !ctx.GlobalBool(DisableReturnDataFlag.Name),
} }
var ( var (

24
internal/debug/flags.go
View file

@ -178,11 +178,11 @@ func Setup(ctx *cli.Context) error {
handler slog.Handler handler slog.Handler
terminalOutput = io.Writer(os.Stderr) terminalOutput = io.Writer(os.Stderr)
output io.Writer output io.Writer
logFmtFlag = ctx.String(logFormatFlag.Name) logFmtFlag = ctx.GlobalString(logFormatFlag.Name)
) )
var ( var (
logFile = ctx.String(logFileFlag.Name) logFile = ctx.GlobalString(logFileFlag.Name)
rotation = ctx.Bool(logRotateFlag.Name) rotation = ctx.GlobalBool(logRotateFlag.Name)
) )
if len(logFile) > 0 { if len(logFile) > 0 {
if err := validateLogLocation(filepath.Dir(logFile)); err != nil { if err := validateLogLocation(filepath.Dir(logFile)); err != nil {
@ -205,10 +205,10 @@ func Setup(ctx *cli.Context) error {
} }
logOutputFile = &lumberjack.Logger{ logOutputFile = &lumberjack.Logger{
Filename: logFile, Filename: logFile,
MaxSize: ctx.Int(logMaxSizeMBsFlag.Name), MaxSize: ctx.GlobalInt(logMaxSizeMBsFlag.Name),
MaxBackups: ctx.Int(logMaxBackupsFlag.Name), MaxBackups: ctx.GlobalInt(logMaxBackupsFlag.Name),
MaxAge: ctx.Int(logMaxAgeFlag.Name), MaxAge: ctx.GlobalInt(logMaxAgeFlag.Name),
Compress: ctx.Bool(logCompressFlag.Name), Compress: ctx.GlobalBool(logCompressFlag.Name),
} }
output = io.MultiWriter(terminalOutput, logOutputFile) output = io.MultiWriter(terminalOutput, logOutputFile)
} else if logFile != "" { } else if logFile != "" {
@ -223,7 +223,7 @@ func Setup(ctx *cli.Context) error {
} }
switch { switch {
case ctx.Bool(logjsonFlag.Name): case ctx.GlobalBool(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.JSONHandlerWithLevel(output, log.LevelInfo) handler = log.JSONHandlerWithLevel(output, log.LevelInfo)
@ -244,18 +244,18 @@ func Setup(ctx *cli.Context) error {
handler = log.NewTerminalHandler(output, useColor) handler = log.NewTerminalHandler(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.GlobalString(logFormatFlag.Name))
} }
glogger = log.NewGlogHandler(handler) glogger = log.NewGlogHandler(handler)
// logging // logging
verbosity := log.FromLegacyLevel(ctx.Int(verbosityFlag.Name)) verbosity := log.FromLegacyLevel(ctx.GlobalInt(verbosityFlag.Name))
glogger.Verbosity(verbosity) glogger.Verbosity(verbosity)
vmodule := ctx.String(logVmoduleFlag.Name) vmodule := ctx.GlobalString(logVmoduleFlag.Name)
if vmodule == "" { if vmodule == "" {
// Retain backwards compatibility with `--vmodule` flag if `--log-vmodule` not set // Retain backwards compatibility with `--vmodule` flag if `--log-vmodule` not set
vmodule = ctx.String(vmoduleFlag.Name) vmodule = ctx.GlobalString(vmoduleFlag.Name)
if vmodule != "" { if vmodule != "" {
defer log.Warn("The flag '--vmodule' is deprecated, please use '--log-vmodule' instead") defer log.Warn("The flag '--vmodule' is deprecated, please use '--log-vmodule' instead")
} }