internal/debug: remove deprecated flags (#23368)
* internal/debug: remove deprecated flags The removed flags are removed in the main portion of geth, this removes it internally too. * internal/debug: remove legacy --debug and legacy --backtrace flag * Update flags.go Co-authored-by: Martin Holst Swende <martin@swende.se>
This commit is contained in:
parent
7957530225
commit
ca5bc676d1
@ -90,39 +90,6 @@ var (
|
|||||||
Name: "trace",
|
Name: "trace",
|
||||||
Usage: "Write execution trace to the given file",
|
Usage: "Write execution trace to the given file",
|
||||||
}
|
}
|
||||||
// (Deprecated April 2020)
|
|
||||||
legacyPprofPortFlag = cli.IntFlag{
|
|
||||||
Name: "pprofport",
|
|
||||||
Usage: "pprof HTTP server listening port (deprecated, use --pprof.port)",
|
|
||||||
Value: 6060,
|
|
||||||
}
|
|
||||||
legacyPprofAddrFlag = cli.StringFlag{
|
|
||||||
Name: "pprofaddr",
|
|
||||||
Usage: "pprof HTTP server listening interface (deprecated, use --pprof.addr)",
|
|
||||||
Value: "127.0.0.1",
|
|
||||||
}
|
|
||||||
legacyMemprofilerateFlag = cli.IntFlag{
|
|
||||||
Name: "memprofilerate",
|
|
||||||
Usage: "Turn on memory profiling with the given rate (deprecated, use --pprof.memprofilerate)",
|
|
||||||
Value: runtime.MemProfileRate,
|
|
||||||
}
|
|
||||||
legacyBlockprofilerateFlag = cli.IntFlag{
|
|
||||||
Name: "blockprofilerate",
|
|
||||||
Usage: "Turn on block profiling with the given rate (deprecated, use --pprof.blockprofilerate)",
|
|
||||||
}
|
|
||||||
legacyCpuprofileFlag = cli.StringFlag{
|
|
||||||
Name: "cpuprofile",
|
|
||||||
Usage: "Write CPU profile to the given file (deprecated, use --pprof.cpuprofile)",
|
|
||||||
}
|
|
||||||
legacyBacktraceAtFlag = cli.StringFlag{
|
|
||||||
Name: "backtrace",
|
|
||||||
Usage: "Request a stack trace at a specific logging statement (e.g. \"block.go:271\") (deprecated, use --log.backtrace)",
|
|
||||||
Value: "",
|
|
||||||
}
|
|
||||||
legacyDebugFlag = cli.BoolFlag{
|
|
||||||
Name: "debug",
|
|
||||||
Usage: "Prepends log messages with call-site location (file and line number) (deprecated, use --log.debug)",
|
|
||||||
}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Flags holds all command-line flags required for debugging.
|
// Flags holds all command-line flags required for debugging.
|
||||||
@ -141,17 +108,6 @@ var Flags = []cli.Flag{
|
|||||||
traceFlag,
|
traceFlag,
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is the list of deprecated debugging flags.
|
|
||||||
var DeprecatedFlags = []cli.Flag{
|
|
||||||
legacyPprofPortFlag,
|
|
||||||
legacyPprofAddrFlag,
|
|
||||||
legacyMemprofilerateFlag,
|
|
||||||
legacyBlockprofilerateFlag,
|
|
||||||
legacyCpuprofileFlag,
|
|
||||||
legacyBacktraceAtFlag,
|
|
||||||
legacyDebugFlag,
|
|
||||||
}
|
|
||||||
|
|
||||||
var glogger *log.GlogHandler
|
var glogger *log.GlogHandler
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
@ -183,45 +139,23 @@ func Setup(ctx *cli.Context) error {
|
|||||||
glogger.Vmodule(vmodule)
|
glogger.Vmodule(vmodule)
|
||||||
|
|
||||||
debug := ctx.GlobalBool(debugFlag.Name)
|
debug := ctx.GlobalBool(debugFlag.Name)
|
||||||
if ctx.GlobalIsSet(legacyDebugFlag.Name) {
|
|
||||||
debug = ctx.GlobalBool(legacyDebugFlag.Name)
|
|
||||||
log.Warn("The flag --debug is deprecated and will be removed in the future, please use --log.debug")
|
|
||||||
}
|
|
||||||
if ctx.GlobalIsSet(debugFlag.Name) {
|
if ctx.GlobalIsSet(debugFlag.Name) {
|
||||||
debug = ctx.GlobalBool(debugFlag.Name)
|
debug = ctx.GlobalBool(debugFlag.Name)
|
||||||
}
|
}
|
||||||
log.PrintOrigins(debug)
|
log.PrintOrigins(debug)
|
||||||
|
|
||||||
backtrace := ctx.GlobalString(backtraceAtFlag.Name)
|
backtrace := ctx.GlobalString(backtraceAtFlag.Name)
|
||||||
if b := ctx.GlobalString(legacyBacktraceAtFlag.Name); b != "" {
|
|
||||||
backtrace = b
|
|
||||||
log.Warn("The flag --backtrace is deprecated and will be removed in the future, please use --log.backtrace")
|
|
||||||
}
|
|
||||||
if b := ctx.GlobalString(backtraceAtFlag.Name); b != "" {
|
|
||||||
backtrace = b
|
|
||||||
}
|
|
||||||
glogger.BacktraceAt(backtrace)
|
glogger.BacktraceAt(backtrace)
|
||||||
|
|
||||||
log.Root().SetHandler(glogger)
|
log.Root().SetHandler(glogger)
|
||||||
|
|
||||||
// profiling, tracing
|
// profiling, tracing
|
||||||
runtime.MemProfileRate = memprofilerateFlag.Value
|
runtime.MemProfileRate = memprofilerateFlag.Value
|
||||||
if ctx.GlobalIsSet(legacyMemprofilerateFlag.Name) {
|
|
||||||
runtime.MemProfileRate = ctx.GlobalInt(legacyMemprofilerateFlag.Name)
|
|
||||||
log.Warn("The flag --memprofilerate is deprecated and will be removed in the future, please use --pprof.memprofilerate")
|
|
||||||
}
|
|
||||||
if ctx.GlobalIsSet(memprofilerateFlag.Name) {
|
if ctx.GlobalIsSet(memprofilerateFlag.Name) {
|
||||||
runtime.MemProfileRate = ctx.GlobalInt(memprofilerateFlag.Name)
|
runtime.MemProfileRate = ctx.GlobalInt(memprofilerateFlag.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
blockProfileRate := blockprofilerateFlag.Value
|
blockProfileRate := ctx.GlobalInt(blockprofilerateFlag.Name)
|
||||||
if ctx.GlobalIsSet(legacyBlockprofilerateFlag.Name) {
|
|
||||||
blockProfileRate = ctx.GlobalInt(legacyBlockprofilerateFlag.Name)
|
|
||||||
log.Warn("The flag --blockprofilerate is deprecated and will be removed in the future, please use --pprof.blockprofilerate")
|
|
||||||
}
|
|
||||||
if ctx.GlobalIsSet(blockprofilerateFlag.Name) {
|
|
||||||
blockProfileRate = ctx.GlobalInt(blockprofilerateFlag.Name)
|
|
||||||
}
|
|
||||||
Handler.SetBlockProfileRate(blockProfileRate)
|
Handler.SetBlockProfileRate(blockProfileRate)
|
||||||
|
|
||||||
if traceFile := ctx.GlobalString(traceFlag.Name); traceFile != "" {
|
if traceFile := ctx.GlobalString(traceFlag.Name); traceFile != "" {
|
||||||
|
Loading…
Reference in New Issue
Block a user