Revert "cmd/geth: rename --vmodule to --log.vmodule (#27071)"

This reverts commit 518de7f5f5.
This commit is contained in:
devopsbo3 2023-11-10 12:27:53 -06:00 committed by GitHub
parent 3ee47f80a8
commit c342730561

View file

@ -45,17 +45,10 @@ var (
Value: 3, Value: 3,
Category: flags.LoggingCategory, Category: flags.LoggingCategory,
} }
logVmoduleFlag = &cli.StringFlag{
Name: "log.vmodule",
Usage: "Per-module verbosity: comma-separated list of <pattern>=<level> (e.g. eth/*=5,p2p=4)",
Value: "",
Category: flags.LoggingCategory,
}
vmoduleFlag = &cli.StringFlag{ vmoduleFlag = &cli.StringFlag{
Name: "vmodule", Name: "vmodule",
Usage: "Per-module verbosity: comma-separated list of <pattern>=<level> (e.g. eth/*=5,p2p=4)", Usage: "Per-module verbosity: comma-separated list of <pattern>=<level> (e.g. eth/*=5,p2p=4)",
Value: "", Value: "",
Hidden: true,
Category: flags.LoggingCategory, Category: flags.LoggingCategory,
} }
logjsonFlag = &cli.BoolFlag{ logjsonFlag = &cli.BoolFlag{
@ -156,7 +149,6 @@ var (
// Flags holds all command-line flags required for debugging. // Flags holds all command-line flags required for debugging.
var Flags = []cli.Flag{ var Flags = []cli.Flag{
verbosityFlag, verbosityFlag,
logVmoduleFlag,
vmoduleFlag, vmoduleFlag,
backtraceAtFlag, backtraceAtFlag,
debugFlag, debugFlag,
@ -260,14 +252,7 @@ func Setup(ctx *cli.Context) error {
// logging // logging
verbosity := ctx.Int(verbosityFlag.Name) verbosity := ctx.Int(verbosityFlag.Name)
glogger.Verbosity(log.Lvl(verbosity)) glogger.Verbosity(log.Lvl(verbosity))
vmodule := ctx.String(logVmoduleFlag.Name) vmodule := ctx.String(vmoduleFlag.Name)
if vmodule == "" {
// Retain backwards compatibility with `--vmodule` flag if `--log.vmodule` not set
vmodule = ctx.String(vmoduleFlag.Name)
if vmodule != "" {
defer log.Warn("The flag '--vmodule' is deprecated, please use '--log.vmodule' instead")
}
}
glogger.Vmodule(vmodule) glogger.Vmodule(vmodule)
debug := ctx.Bool(debugFlag.Name) debug := ctx.Bool(debugFlag.Name)