diff --git a/cmd/geth/main.go b/cmd/geth/main.go index ce40be3fd6..119d525740 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -144,8 +144,8 @@ var ( utils.GpoMaxGasPriceFlag, utils.GpoIgnoreGasPriceFlag, configFileFlag, - utils.DebugFlag, - utils.BacktraceAtFlag, + utils.LogDebugFlag, + utils.LogBacktraceAtFlag, }, utils.NetworkFlags, utils.DatabaseFlags) rpcFlags = []cli.Flag{ diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 482dc886cb..b6c69b2a26 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -1460,10 +1460,10 @@ func SetNodeConfig(ctx *cli.Context, cfg *node.Config) { cfg.DBEngine = dbEngine } // deprecation notice for log debug flags (TODO: find a more appropriate place to put these?) - if ctx.IsSet(BacktraceAtFlag.Name) { + if ctx.IsSet(LogBacktraceAtFlag.Name) { log.Warn("log.backtrace flag is deprecated") } - if ctx.IsSet(DebugFlag.Name) { + if ctx.IsSet(LogDebugFlag.Name) { log.Warn("log.debug flag is deprecated") } } diff --git a/cmd/utils/flags_legacy.go b/cmd/utils/flags_legacy.go index 88a4bcd80f..e8b867e4db 100644 --- a/cmd/utils/flags_legacy.go +++ b/cmd/utils/flags_legacy.go @@ -39,6 +39,8 @@ var DeprecatedFlags = []cli.Flag{ CacheTrieRejournalFlag, LegacyDiscoveryV5Flag, TxLookupLimitFlag, + LogBacktraceAtFlag, + LogDebugFlag, } var ( @@ -78,16 +80,16 @@ var ( Category: flags.DeprecatedCategory, } // Deprecated November 2023 - BacktraceAtFlag = &cli.StringFlag{ + LogBacktraceAtFlag = &cli.StringFlag{ Name: "log.backtrace", - Usage: "Request a stack trace at a specific logging statement (e.g. \"block.go:271\")", + Usage: "Request a stack trace at a specific logging statement (deprecated)", Value: "", - Category: flags.LoggingCategory, + Category: flags.DeprecatedCategory, } - DebugFlag = &cli.BoolFlag{ + LogDebugFlag = &cli.BoolFlag{ Name: "log.debug", - Usage: "Prepends log messages with call-site location (file and line number)", - Category: flags.LoggingCategory, + Usage: "Prepends log messages with call-site location (deprecated)", + Category: flags.DeprecatedCategory, } )