add back filtering from tendermint 0.33

This commit is contained in:
marbar3778
2022-06-13 17:32:19 +02:00
parent 1299b77ddf
commit 0b0b074358
7 changed files with 205 additions and 11 deletions
+2 -1
View File
@@ -51,7 +51,8 @@ func RootCommand(conf *config.Config, logger log.Logger) *cobra.Command {
}
*conf = *pconf
config.EnsureRoot(conf.RootDir)
if err := log.OverrideWithNewLogger(logger, conf.LogFormat, conf.LogLevel); err != nil {
logger, err = cli.ParseLogLevel(conf.LogLevel, logger, config.DefaultPackageLogLevels())
if err != nil {
return err
}
if warning := pconf.DeprecatedFieldWarning(); warning != nil {
+4 -4
View File
@@ -135,7 +135,7 @@ func TestRootConfig(t *testing.T) {
defer cancel()
// write non-default config
nonDefaultLogLvl := "debug"
nonDefaultLogLvl := "abc:debug"
cvals := map[string]string{
"log-level": nonDefaultLogLvl,
}
@@ -145,9 +145,9 @@ func TestRootConfig(t *testing.T) {
env map[string]string
logLvl string
}{
{nil, nil, nonDefaultLogLvl}, // should load config
{[]string{"--log-level=info"}, nil, "info"}, // flag over rides
{nil, map[string]string{"TM_LOG_LEVEL": "info"}, "info"}, // env over rides
{nil, nil, nonDefaultLogLvl}, // should load config
{[]string{"--log-level=abc:info"}, nil, "abc:info"}, // flag over rides
{nil, map[string]string{"TM_LOG_LEVEL": "abc:info"}, "abc:info"}, // env over rides
}
for i, tc := range cases {
+1 -1
View File
@@ -20,7 +20,7 @@ func main() {
panic(err)
}
logger, err := log.NewDefaultLogger(conf.LogFormat, conf.LogLevel)
logger, err := log.NewDefaultLogger(conf.LogFormat, "info") // todo incorrect
if err != nil {
panic(err)
}