Less log lines to STDOUT

logger/log.go

@@ -5,32 +5,41 @@ import (
 	"os"
 
 	"github.com/tendermint/log15"
+	. "github.com/tendermint/tendermint/common"
 	"github.com/tendermint/tendermint/config"
 )
 
 var rootHandler log15.Handler
 
+func getLevel(lvlString string) log15.Lvl {
+	lvl, err := log15.LvlFromString(lvlString)
+	if err != nil {
+		Exit(Fmt("Invalid log level %v: %v", lvlString, err))
+	}
+	return lvl
+}
+
 func init() {
 	handlers := []log15.Handler{}
 
 	// By default, there's a stdout terminal format handler.
 	handlers = append(handlers, log15.LvlFilterHandler(
-		log15.LvlDebug,
+		getLevel(config.App.GetString("Log.Stdout.Level")),
 		log15.StreamHandler(os.Stdout, log15.TerminalFormat()),
 	))
 
 	// Maybe also write to a file.
-	if config.App.GetString("Log.Dir") != "" {
+	if _logFileDir := config.App.GetString("Log.File.Dir"); _logFileDir != "" {
 		// Create log dir if it doesn't exist
-		err := os.MkdirAll(config.App.GetString("Log.Dir"), 0700)
+		err := os.MkdirAll(_logFileDir, 0700)
 		if err != nil {
 			fmt.Printf("Could not create directory: %v", err)
 			os.Exit(1)
 		}
 		// File handler
 		handlers = append(handlers, log15.LvlFilterHandler(
-			log15.LvlDebug,
-			log15.Must.FileHandler(config.App.GetString("Log.Dir")+"/tendermint.log", log15.LogfmtFormat()),
+			getLevel(config.App.GetString("Log.File.Level")),
+			log15.Must.FileHandler(_logFileDir+"/tendermint.log", log15.LogfmtFormat()),
 		))
 	}