diff options
Diffstat (limited to 'cmd/utils')
| -rw-r--r-- | cmd/utils/cmd.go | 8 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 22 |
2 files changed, 26 insertions, 4 deletions
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index feea29d64..a6140d233 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -33,10 +33,10 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/rlp" ) -var clilogger = logger.NewLogger("CLI") var interruptCallbacks = []func(os.Signal){} // Register interrupt handlers callbacks @@ -50,7 +50,7 @@ func HandleInterrupt() { go func() { signal.Notify(c, os.Interrupt) for sig := range c { - clilogger.Errorf("Shutting down (%v) ... \n", sig) + glog.V(logger.Error).Infof("Shutting down (%v) ... \n", sig) RunInterruptCallbacks(sig) } }() @@ -113,7 +113,7 @@ func Fatalf(format string, args ...interface{}) { } func StartEthereum(ethereum *eth.Ethereum) { - clilogger.Infoln("Starting ", ethereum.Name()) + glog.V(logger.Info).Infoln("Starting ", ethereum.Name()) if err := ethereum.Start(); err != nil { exit(err) } @@ -124,7 +124,7 @@ func StartEthereum(ethereum *eth.Ethereum) { } func StartEthereumForTest(ethereum *eth.Ethereum) { - clilogger.Infoln("Starting ", ethereum.Name()) + glog.V(logger.Info).Infoln("Starting ", ethereum.Name()) ethereum.StartForTest() RegisterInterrupt(func(sig os.Signal) { ethereum.Stop() diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index e82fd9c28..51844a68e 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -15,6 +15,7 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/p2p/nat" "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/xeth" @@ -184,6 +185,20 @@ var ( Usage: "JS library path to be used with console and js subcommands", Value: ".", } + BacktraceAtFlag = cli.GenericFlag{ + Name: "backtrace_at", + Usage: "When set to a file and line number holding a logging statement a stack trace will be written to the Info log", + Value: glog.GetTraceLocation(), + } + LogToStdErrFlag = cli.BoolFlag{ + Name: "logtostderr", + Usage: "Logs are written to standard error instead of to files.", + } + LogVModuleFlag = cli.GenericFlag{ + Name: "vmodule", + Usage: "The syntax of the argument is a comma-separated list of pattern=N, where pattern is a literal file name (minus the \".go\" suffix) or \"glob\" pattern and N is a V level.", + Value: glog.GetVModule(), + } ) func GetNAT(ctx *cli.Context) nat.Interface { @@ -213,6 +228,13 @@ func GetNodeKey(ctx *cli.Context) (key *ecdsa.PrivateKey) { } func MakeEthConfig(clientID, version string, ctx *cli.Context) *eth.Config { + // Set verbosity on glog + glog.SetV(ctx.GlobalInt(LogLevelFlag.Name)) + // Set the log type + glog.SetToStderr(ctx.GlobalBool(LogToStdErrFlag.Name)) + // Set the log dir + glog.SetLogDir(ctx.GlobalString(LogFileFlag.Name)) + return ð.Config{ Name: common.MakeName(clientID, version), DataDir: ctx.GlobalString(DataDirFlag.Name), |