Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable configuring delegated zap-logging for embed server.

Browse Source
This commit is contained in:
Piotr Tabor
2021-03-16 22:21:13 +01:00
parent a84bd093b0
commit 725a8c5e02
5 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/embed/config_logging.go
View File

@@ -21,6 +21,7 @@ import (
"os"
"sync"
grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap"
"go.etcd.io/etcd/pkg/v3/logutil"
"go.uber.org/zap"
@@ -232,7 +233,11 @@ func NewZapCoreLoggerBuilder(lg *zap.Logger, cr zapcore.Core, syncer zapcore.Wri
cfg.loggerWriteSyncer = syncer
grpcLogOnce.Do(func() {
grpclog.SetLoggerV2(logutil.NewGRPCLoggerV2FromZapCore(cr, syncer))
if cr != nil && syncer != nil {
grpclog.SetLoggerV2(logutil.NewGRPCLoggerV2FromZapCore(cr, syncer))
} else {
grpc_zap.ReplaceGrpcLoggerV2(cfg.logger.Named("grpc"))
}
})
return nil
}