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

embed: add "loggerCore" field for Raft logger

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-04-24 15:40:52 -07:00
parent a34dd272b0
commit d33a74d380
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
embed/config.go
View File

@ -261,13 +261,6 @@ type Config struct {
ListenMetricsUrls []url.URL ListenMetricsUrls []url.URL
ListenMetricsUrlsJSON string `json:"listen-metrics-urls"` ListenMetricsUrlsJSON string `json:"listen-metrics-urls"`
// logger logs server-side operations. The default is nil,
// and "setupLogging" must be called before starting server.
// Do not set logger directly.
loggerMu *sync.RWMutex
logger *zap.Logger
loggerConfig *zap.Config
// Logger is logger options: "zap", "capnslog". // Logger is logger options: "zap", "capnslog".
// WARN: "capnslog" is being deprecated in v3.5. // WARN: "capnslog" is being deprecated in v3.5.
Logger string `json:"logger"` Logger string `json:"logger"`
@ -282,6 +275,22 @@ type Config struct {
// Debug is true, to enable debug level logging. // Debug is true, to enable debug level logging.
Debug bool `json:"debug"` Debug bool `json:"debug"`
// logger logs server-side operations. The default is nil,
// and "setupLogging" must be called before starting server.
// Do not set logger directly.
loggerMu *sync.RWMutex
logger *zap.Logger
// loggerConfig is server logger configuration for Raft logger.
// Must be either: "loggerConfig != nil" or "loggerCore != nil && loggerWriteSyncer != nil".
loggerConfig *zap.Config
// loggerCore is "zapcore.Core" for raft logger.
// Must be either: "loggerConfig != nil" or "loggerCore != nil && loggerWriteSyncer != nil".
loggerCore zapcore.Core
loggerWriteSyncer zapcore.WriteSyncer
// TO BE DEPRECATED
// LogPkgLevels is being deprecated in v3.5. // LogPkgLevels is being deprecated in v3.5.
// Only valid if "logger" option is "capnslog". // Only valid if "logger" option is "capnslog".
// WARN: DO NOT USE THIS! // WARN: DO NOT USE THIS!
@ -519,7 +528,10 @@ func (cfg *Config) setupLogging() error {
if err != nil { if err != nil {
return err return err
} }
cfg.loggerConfig = &lcfg cfg.loggerConfig = &lcfg
cfg.loggerCore = nil
cfg.loggerWriteSyncer = nil
grpcLogOnce.Do(func() { grpcLogOnce.Do(func() {
// debug true, enable info, warning, error // debug true, enable info, warning, error
@ -548,6 +560,10 @@ func (cfg *Config) setupLogging() error {
) )
cfg.logger = zap.New(cr, zap.AddCaller(), zap.ErrorOutput(syncer)) cfg.logger = zap.New(cr, zap.AddCaller(), zap.ErrorOutput(syncer))
cfg.loggerConfig = nil
cfg.loggerCore = cr
cfg.loggerWriteSyncer = syncer
grpcLogOnce.Do(func() { grpcLogOnce.Do(func() {
grpclog.SetLoggerV2(logutil.NewGRPCLoggerV2FromZapCore(cr, syncer)) grpclog.SetLoggerV2(logutil.NewGRPCLoggerV2FromZapCore(cr, syncer))
}) })

2
embed/etcd.go
View File

@ -190,6 +190,8 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) {
PreVote: cfg.PreVote, PreVote: cfg.PreVote,
Logger: cfg.logger, Logger: cfg.logger,
LoggerConfig: cfg.loggerConfig, LoggerConfig: cfg.loggerConfig,
LoggerCore: cfg.loggerCore,
LoggerWriteSyncer: cfg.loggerWriteSyncer,
Debug: cfg.Debug, Debug: cfg.Debug,
ForceNewCluster: cfg.ForceNewCluster, ForceNewCluster: cfg.ForceNewCluster,
} }