Skip to content

Commit

Permalink
Fix don't swallow the error when building zap logger (cadence-workflo…
Browse files Browse the repository at this point in the history
  • Loading branch information
git-hulk authored Apr 7, 2021
1 parent 3a1e1bc commit 07d5371
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 12 deletions.
5 changes: 4 additions & 1 deletion bench/lib/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ type RuntimeContext struct {

// NewRuntimeContext builds a runtime context from the config
func NewRuntimeContext(cfg *Config) (*RuntimeContext, error) {
logger := cfg.Log.NewZapLogger()
logger, err := cfg.Log.NewZapLogger()
if err != nil {
return nil, err
}

metricsScope := cfg.Metrics.NewScope(loggerimpl.NewLogger(logger), cfg.Bench.Name)

Expand Down
5 changes: 4 additions & 1 deletion canary/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ type canaryRunner struct {
// NewCanaryRunner creates and returns a runnable which spins
// up a set of canaries based on supplied config
func NewCanaryRunner(cfg *Config) (Runnable, error) {
logger := cfg.Log.NewZapLogger()
logger, err := cfg.Log.NewZapLogger()
if err != nil {
return nil, fmt.Errorf("failed to create logger: %v", err)
}

metricsScope := cfg.Metrics.NewScope(loggerimpl.NewLogger(logger), "cadence-canary")

Expand Down
10 changes: 6 additions & 4 deletions cmd/server/cadence/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,14 @@ func (s *server) Stop() {

// startService starts a service with the given name and config
func (s *server) startService() common.Daemon {

var err error

params := service.BootstrapParams{}
params.Name = "cadence-" + s.name
params.Logger = loggerimpl.NewLogger(s.cfg.Log.NewZapLogger())

zapLogger, err := s.cfg.Log.NewZapLogger()
if err != nil {
log.Fatal("failed to create the zap logger, err: ", err.Error())
}
params.Logger = loggerimpl.NewLogger(zapLogger)
params.UpdateLoggerWithServiceName(params.Name)
params.PersistenceConfig = s.cfg.Persistence

Expand Down
7 changes: 3 additions & 4 deletions common/service/config/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
const fileMode = os.FileMode(0644)

// NewZapLogger builds and returns a new zap
// logger for this logging configuration
func (cfg *Logger) NewZapLogger() *zap.Logger {
// logger for logging configuration
func (cfg *Logger) NewZapLogger() (*zap.Logger, error) {
encodeConfig := zapcore.EncoderConfig{
TimeKey: "ts",
LevelKey: "level",
Expand Down Expand Up @@ -64,8 +64,7 @@ func (cfg *Logger) NewZapLogger() *zap.Logger {
OutputPaths: []string{outputPath},
ErrorOutputPaths: []string{outputPath},
}
logger, _ := config.Build()
return logger
return config.Build()
}

func parseZapLevel(level string) zapcore.Level {
Expand Down
2 changes: 1 addition & 1 deletion common/service/config/log_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (s *LogSuite) TestNewLogger() {
OutputFile: dir + "/test.log",
}

log := config.NewZapLogger()
log, _ := config.NewZapLogger()
s.NotNil(log)
_, err = os.Stat(dir + "/test.log")
s.Nil(err)
Expand Down
6 changes: 5 additions & 1 deletion tools/cli/domainUtils.go
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,11 @@ func initializeDomainHandler(
func initializeLogger(
serviceConfig *config.Config,
) log.Logger {
return loggerimpl.NewLogger(serviceConfig.Log.NewZapLogger())
zapLogger, err := serviceConfig.Log.NewZapLogger()
if err != nil {
ErrorAndExit("failed to create zap logger, err: ", err)
}
return loggerimpl.NewLogger(zapLogger)
}

func initializeMetadataMgr(
Expand Down

0 comments on commit 07d5371

Please sign in to comment.