integration: use default log configuration

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
This commit is contained in:
Gyuho Lee 2019-02-21 10:57:51 -08:00
parent 4f46b65748
commit dca0dec382

View File

@ -47,6 +47,7 @@ import (
lockpb "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb" lockpb "go.etcd.io/etcd/etcdserver/api/v3lock/v3lockpb"
"go.etcd.io/etcd/etcdserver/api/v3rpc" "go.etcd.io/etcd/etcdserver/api/v3rpc"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
"go.etcd.io/etcd/pkg/logutil"
"go.etcd.io/etcd/pkg/testutil" "go.etcd.io/etcd/pkg/testutil"
"go.etcd.io/etcd/pkg/tlsutil" "go.etcd.io/etcd/pkg/tlsutil"
"go.etcd.io/etcd/pkg/transport" "go.etcd.io/etcd/pkg/transport"
@ -673,19 +674,10 @@ func mustNewMember(t testing.TB, mcfg memberConfig) *member {
m.InitialCorruptCheck = true m.InitialCorruptCheck = true
m.LoggerConfig = &zap.Config{ lcfg := logutil.DefaultZapLoggerConfig
Level: zap.NewAtomicLevelAt(zap.InfoLevel), m.LoggerConfig = &lcfg
Development: false, m.LoggerConfig.OutputPaths = []string{"/dev/null"}
Sampling: &zap.SamplingConfig{ m.LoggerConfig.ErrorOutputPaths = []string{"/dev/null"}
Initial: 100,
Thereafter: 100,
},
Encoding: "json",
EncoderConfig: zap.NewProductionEncoderConfig(),
OutputPaths: []string{"/dev/null"},
ErrorOutputPaths: []string{"/dev/null"},
}
if os.Getenv("CLUSTER_DEBUG") != "" { if os.Getenv("CLUSTER_DEBUG") != "" {
m.LoggerConfig.OutputPaths = []string{"stderr"} m.LoggerConfig.OutputPaths = []string{"stderr"}
m.LoggerConfig.ErrorOutputPaths = []string{"stderr"} m.LoggerConfig.ErrorOutputPaths = []string{"stderr"}