Merge "[FAB-6164] Update only modules with prefix at peer st"

hulatown · Sep 19, 2017 · 3f83afc · 3f83afc
2 parents 472a4bd + 7ea3e4b
commit 3f83afc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/common/flogging/logging_test.go b/common/flogging/logging_test.go
@@ -62,6 +62,8 @@ func TestSetModuleLevel(t *testing.T) {
 			[]string{"foo/bar", "bar/baz"}, false, false},
 		testCase{"RegexComplex", []string{"^[a-z]+\\/[a-z]+#.+$", "warning"}, []string{flogging.DefaultLevel(), flogging.DefaultLevel(), "WARNING", "WARNING", "WARNING"},
 			[]string{"gossip/util", "orderer/util", "gossip/gossip#0.0.0.0:7051", "gossip/conn#-1", "orderer/conn#0.0.0.0:7051"}, false, false},
+		testCase{"RegexPrefix", []string{"^test", "warning"}, []string{"WARNING", "WARNING", flogging.DefaultLevel()},
+			[]string{"test", "test/peer", "peer/test"}, false, false},
 		testCase{"RegexInvalid", []string{"(", "warning"}, []string{flogging.DefaultLevel()},
 			[]string{"foo"}, false, true},
 		testCase{"RevertLevels", []string{"revertmodule1", "warning", "revertmodule2", "debug"}, []string{"WARNING", "DEBUG", "DEBUG"},

diff --git a/peer/common/common.go b/peer/common/common.go
@@ -208,7 +208,8 @@ func SetLogLevelFromViper(module string) error {
 	if err != nil {
 		return err
 	}
-	_, err = flogging.SetModuleLevel(module, logLevelFromViper)
+	// only set logging modules that begin with the supplied module name here
+	_, err = flogging.SetModuleLevel("^"+module, logLevelFromViper)
 	return err
 }