From 348b0d40a6cc7cda30c94ff44d65776cecdc018a Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Sun, 28 Jul 2019 21:06:05 -0500 Subject: [PATCH] embed: do not expose "zapLoggerBuilder" Signed-off-by: Gyuho Lee --- 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 d60493340..2087ae8af 100644 --- a/embed/config.go +++ b/embed/config.go @@ -307,8 +307,8 @@ type Config struct { // Debug is true, to enable debug level logging. Debug bool `json:"debug"` - // 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 0478fb444..246444da1 100644 --- a/embed/config_logging.go +++ b/embed/config_logging.go @@ -162,8 +162,8 @@ func (cfg *Config) setupLogging() error { copied.Level = zap.NewAtomicLevelAt(zap.DebugLevel) 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 { @@ -214,8 +214,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() @@ -231,7 +231,7 @@ func (cfg *Config) setupLogging() error { } } - err := cfg.ZapLoggerBuilder(cfg) + err := cfg.zapLoggerBuilder(cfg) if err != nil { return err }