From c7c379e52e5b8a94672b90ac60fa94da48903bd7 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 13 Sep 2019 07:46:01 -0400 Subject: [PATCH] embed: expose ZapLoggerBuilder This exposes the ZapLoggerBuilder in the embed.Config to allow for custom loggers to be defined and used by embedded etcd. Fixes #11144 --- embed/config.go | 4 ++-- embed/config_logging.go | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/embed/config.go b/embed/config.go index 278316b518f..2f64d927f2a 100644 --- a/embed/config.go +++ b/embed/config.go @@ -303,8 +303,8 @@ type Config struct { // It can be multiple when "Logger" is zap. LogOutputs []string `json:"log-outputs"` - // zapLoggerBuilder is used to build the zap logger. - zapLoggerBuilder func(*Config) error + // ZapLoggerBuilder is used to build the zap logger. + ZapLoggerBuilder func(*Config) error // logger logs server-side operations. The default is nil, // and "setupLogging" must be called before starting server. diff --git a/embed/config_logging.go b/embed/config_logging.go index 583f343d12c..e42103cb18c 100644 --- a/embed/config_logging.go +++ b/embed/config_logging.go @@ -181,8 +181,8 @@ func (cfg *Config) setupLogging() error { // TODO: remove "Debug" check in v3.5 grpc.EnableTracing = true } - if cfg.zapLoggerBuilder == nil { - cfg.zapLoggerBuilder = func(c *Config) error { + if cfg.ZapLoggerBuilder == nil { + cfg.ZapLoggerBuilder = func(c *Config) error { var err error c.logger, err = copied.Build() if err != nil { @@ -235,8 +235,8 @@ func (cfg *Config) setupLogging() error { syncer, lvl, ) - if cfg.zapLoggerBuilder == nil { - cfg.zapLoggerBuilder = func(c *Config) error { + if cfg.ZapLoggerBuilder == nil { + cfg.ZapLoggerBuilder = func(c *Config) error { c.logger = zap.New(cr, zap.AddCaller(), zap.ErrorOutput(syncer)) c.loggerMu.Lock() defer c.loggerMu.Unlock() @@ -252,7 +252,7 @@ func (cfg *Config) setupLogging() error { } } - err := cfg.zapLoggerBuilder(cfg) + err := cfg.ZapLoggerBuilder(cfg) if err != nil { return err }