[VOL-2694] Use package specific logger instance in all log statements
Change-Id: Icf1cb5ade42e42179aed7731b767af2f52481e3d
diff --git a/rw_core/core/common_test.go b/rw_core/core/common_test.go
index 8375f70..f2cf3da 100644
--- a/rw_core/core/common_test.go
+++ b/rw_core/core/common_test.go
@@ -39,7 +39,6 @@
)
const (
- logLevel = log.FatalLevel
volthaSerialNumberKey = "voltha_serial_number"
retryInterval = 50 * time.Millisecond
)
@@ -60,13 +59,6 @@
type isConditionSatisfied func() bool
func init() {
- _, err := log.AddPackage(log.JSON, logLevel, log.Fields{"instanceId": "coreTests"})
- if err != nil {
- panic(err)
- }
- // Update all loggers to log level specified as input parameter
- log.SetAllLogLevel(log.ErrorLevel)
-
//Default mode is two rw-core running in a pair of competing cores
coreInCompeteMode = true
}
@@ -117,7 +109,7 @@
txnPrefix,
client,
cf.KVStoreTimeout); err != nil {
- log.Fatal("creating-transaction-context-failed")
+ logger.Fatal("creating-transaction-context-failed")
}
return client
}
@@ -136,16 +128,16 @@
case OnuAdapter:
adapter = cm.NewONUAdapter(adapterCoreProxy)
default:
- log.Fatalf("invalid-adapter-type-%d", adapterType)
+ logger.Fatalf("invalid-adapter-type-%d", adapterType)
}
adapterReqHandler = com.NewRequestHandlerProxy(coreInstanceID, adapter, adapterCoreProxy)
if err = adapterKafkaICProxy.Start(); err != nil {
- log.Errorw("Failure-starting-adapter-intercontainerProxy", log.Fields{"error": err})
+ logger.Errorw("Failure-starting-adapter-intercontainerProxy", log.Fields{"error": err})
return nil, err
}
if err = adapterKafkaICProxy.SubscribeWithRequestHandlerInterface(kafka.Topic{Name: adapterName}, adapterReqHandler); err != nil {
- log.Errorw("Failure-to-subscribe-onu-request-handler", log.Fields{"error": err})
+ logger.Errorw("Failure-to-subscribe-onu-request-handler", log.Fields{"error": err})
return nil, err
}
return adapter, nil