Merge pull request #98 from tendermint/bugfix/97-unexpected-log-level

parse log level using tmlibs/cli/flags package (Fixes #97)
cosmos · Jun 2, 2017 · 6f7a436 · 6f7a436
2 parents 9a9a3a7 + 20ce43e
commit 6f7a436
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 27 deletions.
diff --git a/cmd/commands/start.go b/cmd/commands/start.go
@@ -12,8 +12,8 @@ import (
 	"github.com/tendermint/abci/server"
 	eyes "github.com/tendermint/merkleeyes/client"
 	"github.com/tendermint/tmlibs/cli"
+	cliflags "github.com/tendermint/tmlibs/cli/flags"
 	cmn "github.com/tendermint/tmlibs/common"
-	"github.com/tendermint/tmlibs/log"
 
 	"github.com/tendermint/tendermint/config"
 	"github.com/tendermint/tendermint/node"
@@ -139,13 +139,10 @@ func startTendermint(dir string, basecoinApp *app.Basecoin) error {
 		return err
 	}
 
-	// TODO: parse the log level from the config properly (multi modules)
-	// but some tm code must be refactored for better usability
-	lvl, err := log.AllowLevel(cfg.LogLevel)
+	tmLogger, err := cliflags.ParseLogLevel(cfg.LogLevel, logger, config.DefaultConfig().LogLevel)
 	if err != nil {
 		return err
 	}
-	tmLogger := log.NewFilter(logger, lvl)
 
 	// Create & start tendermint node
 	privValidator := types.LoadOrGenPrivValidator(cfg.PrivValidatorFile(), tmLogger)

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -40,6 +40,7 @@ import:
   - rpc/lib/types
   - types
 - package: github.com/tendermint/tmlibs
+  version: develop
   subpackages:
   - cli
   - common