Skip to content

Commit

Permalink
embed: do not expose "zapLoggerBuilder"
Browse files Browse the repository at this point in the history
Signed-off-by: Gyuho Lee <[email protected]>
  • Loading branch information
gyuho committed Jul 29, 2019
1 parent 324952c commit 348b0d4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions embed/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions embed/config_logging.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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()
Expand All @@ -231,7 +231,7 @@ func (cfg *Config) setupLogging() error {
}
}

err := cfg.ZapLoggerBuilder(cfg)
err := cfg.zapLoggerBuilder(cfg)
if err != nil {
return err
}
Expand Down

0 comments on commit 348b0d4

Please sign in to comment.