Fix nil pointer in UpdateLoggerWithServiceName (cadence-workflow#1726)

JefferyQ · Apr 22, 2019 · e3ba38c · e3ba38c
1 parent e514d1e
commit e3ba38c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/service/frontend/service.go b/service/frontend/service.go
@@ -112,9 +112,9 @@ type Service struct {
 
 // NewService builds a new cadence-frontend service
 func NewService(params *service.BootstrapParams) common.Daemon {
-	params.UpdateLoggerWithServiceName(common.FrontendServiceName)
 	config := NewConfig(dynamicconfig.NewCollection(params.DynamicConfig, params.Logger), params.PersistenceConfig.NumHistoryShards, params.ESConfig.Enable, true)
 	params.ThrottledLogger = loggerimpl.NewThrottledLogger(params.Logger, config.ThrottledLogRPS)
+	params.UpdateLoggerWithServiceName(common.FrontendServiceName)
 	return &Service{
 		params: params,
 		config: config,

diff --git a/service/history/service.go b/service/history/service.go
@@ -21,10 +21,10 @@
 package history
 
 import (
+	"github.com/uber/cadence/common/log/loggerimpl"
 	"time"
 
 	"github.com/uber/cadence/common"
-	"github.com/uber/cadence/common/log/loggerimpl"
 	"github.com/uber/cadence/common/log/tag"
 	"github.com/uber/cadence/common/metrics"
 	persistencefactory "github.com/uber/cadence/common/persistence/persistence-factory"
@@ -244,12 +244,12 @@ type Service struct {
 
 // NewService builds a new cadence-history service
 func NewService(params *service.BootstrapParams) common.Daemon {
-	params.UpdateLoggerWithServiceName(common.HistoryServiceName)
 	config := NewConfig(dynamicconfig.NewCollection(params.DynamicConfig, params.Logger),
 		params.PersistenceConfig.NumHistoryShards,
 		params.ESConfig.Enable,
 		params.PersistenceConfig.DefaultStoreType())
 	params.ThrottledLogger = loggerimpl.NewThrottledLogger(params.Logger, config.ThrottledLogRPS)
+	params.UpdateLoggerWithServiceName(common.HistoryServiceName)
 	return &Service{
 		params: params,
 		stopC:  make(chan struct{}),

diff --git a/service/matching/service.go b/service/matching/service.go
@@ -84,9 +84,9 @@ type Service struct {
 
 // NewService builds a new cadence-matching service
 func NewService(params *service.BootstrapParams) common.Daemon {
-	params.UpdateLoggerWithServiceName(common.MatchingServiceName)
 	config := NewConfig(dynamicconfig.NewCollection(params.DynamicConfig, params.Logger))
 	params.ThrottledLogger = loggerimpl.NewThrottledLogger(params.Logger, config.ThrottledLogRPS)
+	params.UpdateLoggerWithServiceName(common.MatchingServiceName)
 	return &Service{
 		params: params,
 		config: config,

diff --git a/service/worker/service.go b/service/worker/service.go
@@ -70,9 +70,9 @@ type (
 
 // NewService builds a new cadence-worker service
 func NewService(params *service.BootstrapParams) common.Daemon {
-	params.UpdateLoggerWithServiceName(common.WorkerServiceName)
 	config := NewConfig(params)
 	params.ThrottledLogger = loggerimpl.NewThrottledLogger(params.Logger, config.ThrottledLogRPS)
+	params.UpdateLoggerWithServiceName(common.WorkerServiceName)
 	return &Service{
 		params: params,
 		config: config,