Browse Source

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
chris 6 years ago
parent
commit
e8660c0cec
2 changed files with 7 additions and 7 deletions
  1. 2 2
      embed/config.go
  2. 5 5
      embed/config_logging.go

+ 2 - 2
embed/config.go

@@ -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 func(*Config) error
+	// ZapLoggerBuilder is used to build the zap logger.
+	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.

+ 5 - 5
embed/config_logging.go

@@ -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 {
-				cfg.zapLoggerBuilder = func(c *Config) error {
+			if cfg.ZapLoggerBuilder == nil {
+				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 {
-				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.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
 		}
 		}