fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-28 16:22:15 +00:00
Code Issues Projects Releases Wiki Activity

Renamed --debug to --trace, used for light-client and basecoin

Browse Source
This commit is contained in:
Ethan Frey 2017-05-17 12:03:26 +02:00
parent 67f558cff0
commit 8af1c70a8b
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/setup.go
View File

@ -16,7 +16,7 @@ import (
const ( const (
RootFlag = "root" RootFlag = "root"
HomeFlag = "home" HomeFlag = "home"
DebugFlag = "debug" TraceFlag = "trace"
OutputFlag = "output" OutputFlag = "output"
EncodingFlag = "encoding" EncodingFlag = "encoding"
) )
@ -36,7 +36,7 @@ func PrepareBaseCmd(cmd *cobra.Command, envPrefix, defautRoot string) Executor {
// also, default must be empty, so we can detect this unset and fall back // also, default must be empty, so we can detect this unset and fall back
// to --root / TM_ROOT / TMROOT // to --root / TM_ROOT / TMROOT
cmd.PersistentFlags().String(HomeFlag, "", "root directory for config and data") cmd.PersistentFlags().String(HomeFlag, "", "root directory for config and data")
cmd.PersistentFlags().Bool(DebugFlag, false, "print out full stack trace on errors") cmd.PersistentFlags().Bool(TraceFlag, false, "print out full stack trace on errors")
cmd.PersistentPreRunE = concatCobraCmdFuncs(bindFlagsLoadViper, cmd.PersistentPreRunE) cmd.PersistentPreRunE = concatCobraCmdFuncs(bindFlagsLoadViper, cmd.PersistentPreRunE)
return Executor{cmd} return Executor{cmd}
} }
@ -92,7 +92,7 @@ func (e Executor) Execute() error {
err := e.Command.Execute() err := e.Command.Execute()
if err != nil { if err != nil {
// TODO: something cooler with log-levels // TODO: something cooler with log-levels
if viper.GetBool(DebugFlag) { if viper.GetBool(TraceFlag) {
fmt.Printf("ERROR: %+v\n", err) fmt.Printf("ERROR: %+v\n", err)
} else { } else {
fmt.Println("ERROR:", err.Error()) fmt.Println("ERROR:", err.Error())

18
cli/setup_test.go
View File

@ -184,7 +184,7 @@ func TestSetupUnmarshal(t *testing.T) {
} }
} }
func TestSetupDebug(t *testing.T) { func TestSetupTrace(t *testing.T) {
assert, require := assert.New(t), require.New(t) assert, require := assert.New(t), require.New(t)
cases := []struct { cases := []struct {
@ -193,22 +193,22 @@ func TestSetupDebug(t *testing.T) {
long bool long bool
expected string expected string
}{ }{
{nil, nil, false, "Debug flag = false"}, {nil, nil, false, "Trace flag = false"},
{[]string{"--debug"}, nil, true, "Debug flag = true"}, {[]string{"--trace"}, nil, true, "Trace flag = true"},
{[]string{"--no-such-flag"}, nil, false, "unknown flag: --no-such-flag"}, {[]string{"--no-such-flag"}, nil, false, "unknown flag: --no-such-flag"},
{nil, map[string]string{"DBG_DEBUG": "true"}, true, "Debug flag = true"}, {nil, map[string]string{"DBG_TRACE": "true"}, true, "Trace flag = true"},
} }
for idx, tc := range cases { for idx, tc := range cases {
i := strconv.Itoa(idx) i := strconv.Itoa(idx)
// test command that store value of foobar in local variable // test command that store value of foobar in local variable
debug := &cobra.Command{ trace := &cobra.Command{
Use: "debug", Use: "trace",
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return errors.Errorf("Debug flag = %t", viper.GetBool(DebugFlag)) return errors.Errorf("Trace flag = %t", viper.GetBool(TraceFlag))
}, },
} }
cmd := PrepareBaseCmd(debug, "DBG", "/qwerty/asdfgh") // some missing dir.. cmd := PrepareBaseCmd(trace, "DBG", "/qwerty/asdfgh") // some missing dir..
viper.Reset() viper.Reset()
args := append([]string{cmd.Use}, tc.args...) args := append([]string{cmd.Use}, tc.args...)
@ -219,7 +219,7 @@ func TestSetupDebug(t *testing.T) {
assert.Equal(desired, msg[0], i) assert.Equal(desired, msg[0], i)
if tc.long && assert.True(len(msg) > 2, i) { if tc.long && assert.True(len(msg) > 2, i) {
// the next line starts the stack trace... // the next line starts the stack trace...
assert.Contains(msg[1], "TestSetupDebug", i) assert.Contains(msg[1], "TestSetupTrace", i)
assert.Contains(msg[2], "setup_test.go", i) assert.Contains(msg[2], "setup_test.go", i)
} }
} }