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: do not expose "zapLoggerBuilder"

Browse Source 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
This commit is contained in:
Gyuho Lee 2019-07-28 21:06:05 -05:00
parent 324952c12a
commit 348b0d40a6
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

@ -307,8 +307,8 @@ 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"`
// 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

@ -162,8 +162,8 @@ func (cfg *Config) setupLogging() error {
copied.Level = zap.NewAtomicLevelAt(zap.DebugLevel) copied.Level = zap.NewAtomicLevelAt(zap.DebugLevel)
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 {
@ -214,8 +214,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()
@ -231,7 +231,7 @@ func (cfg *Config) setupLogging() error {
} }
} }
err := cfg.ZapLoggerBuilder(cfg) err := cfg.zapLoggerBuilder(cfg)
if err != nil { if err != nil {
return err return err
} }