From 58ae15bd2972b798bc2eb15552a6a3018bedf226 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Fri, 18 May 2018 15:38:39 -0700 Subject: [PATCH] etcdserver: set default Raft logger with zap.Logger Signed-off-by: Gyuho Lee --- etcdserver/raft.go | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/etcdserver/raft.go b/etcdserver/raft.go index 4b3ad2808..2089f25ad 100644 --- a/etcdserver/raft.go +++ b/etcdserver/raft.go @@ -34,7 +34,6 @@ import ( "github.com/coreos/etcd/wal" "github.com/coreos/etcd/wal/walpb" - "github.com/coreos/pkg/capnslog" "go.uber.org/zap" ) @@ -66,7 +65,25 @@ var ( ) func init() { - raft.SetLogger(capnslog.NewPackageLogger("github.com/coreos/etcd", "raft")) + lcfg := &zap.Config{ + Level: zap.NewAtomicLevelAt(zap.InfoLevel), + Development: false, + Sampling: &zap.SamplingConfig{ + Initial: 100, + Thereafter: 100, + }, + Encoding: "json", + EncoderConfig: zap.NewProductionEncoderConfig(), + + OutputPaths: []string{"stderr"}, + ErrorOutputPaths: []string{"stderr"}, + } + lg, err := logutil.NewRaftLogger(lcfg) + if err != nil { + log.Fatalf("cannot create raft logger %v", err) + } + raft.SetLogger(lg) + expvar.Publish("raft.status", expvar.Func(func() interface{} { raftStatusMu.Lock() defer raftStatusMu.Unlock()