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: expose ZapLoggerBuilder

Browse Source 
This exposes the ZapLoggerBuilder in the embed.Config to allow for
custom loggers to be defined and used by embedded etcd.

Fixes #11144
This commit is contained in:
chris 2019-09-13 07:46:01 -04:00
parent 1e7e66727e
commit e8660c0cec
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
embed/config.go
View File

@ -303,8 +303,8 @@ type Config struct {
// It can be multiple when "Logger" is zap. // It can be multiple when "Logger" is zap.
LogOutputs []string `json:"log-outputs"` LogOutputs []string `json:"log-outputs"`
// zapLoggerBuilder is used to build the zap logger. // ZapLoggerBuilder is used to build the zap logger.
zapLoggerBuilder func(*Config) error ZapLoggerBuilder func(*Config) error
// logger logs server-side operations. The default is nil, // logger logs server-side operations. The default is nil,
// and "setupLogging" must be called before starting server. // and "setupLogging" must be called before starting server.

10
embed/config_logging.go
View File

@ -181,8 +181,8 @@ func (cfg *Config) setupLogging() error {
// TODO: remove "Debug" check in v3.5 // TODO: remove "Debug" check in v3.5
grpc.EnableTracing = true grpc.EnableTracing = true
} }
if cfg.zapLoggerBuilder == nil { if cfg.ZapLoggerBuilder == nil {
cfg.zapLoggerBuilder = func(c *Config) error { cfg.ZapLoggerBuilder = func(c *Config) error {
var err error var err error
c.logger, err = copied.Build() c.logger, err = copied.Build()
if err != nil { if err != nil {
@ -235,8 +235,8 @@ func (cfg *Config) setupLogging() error {
syncer, syncer,
lvl, lvl,
) )
if cfg.zapLoggerBuilder == nil { if cfg.ZapLoggerBuilder == nil {
cfg.zapLoggerBuilder = func(c *Config) error { cfg.ZapLoggerBuilder = func(c *Config) error {
c.logger = zap.New(cr, zap.AddCaller(), zap.ErrorOutput(syncer)) c.logger = zap.New(cr, zap.AddCaller(), zap.ErrorOutput(syncer))
c.loggerMu.Lock() c.loggerMu.Lock()
defer c.loggerMu.Unlock() defer c.loggerMu.Unlock()
@ -252,7 +252,7 @@ func (cfg *Config) setupLogging() error {
} }
} }
err := cfg.zapLoggerBuilder(cfg) err := cfg.ZapLoggerBuilder(cfg)
if err != nil { if err != nil {
return err return err
} }