[VOL-2694] Use package specific logger instance in all log statements
Change-Id: Ib33d89bb04750d3f95901f3d80f9d37d336a3e2c
diff --git a/pkg/adapters/common/common.go b/pkg/adapters/common/common.go
index acf818c..95a036d 100644
--- a/pkg/adapters/common/common.go
+++ b/pkg/adapters/common/common.go
@@ -19,16 +19,12 @@
"github.com/opencord/voltha-lib-go/v3/pkg/log"
)
-const (
- logLevel = log.ErrorLevel
-)
-
var logger log.Logger
func init() {
// Setup this package so that it's log level can be modified at run time
var err error
- logger, err = log.AddPackage(log.JSON, logLevel, log.Fields{"pkg": "common"})
+ logger, err = log.AddPackage(log.JSON, log.ErrorLevel, log.Fields{"pkg": "common"})
if err != nil {
panic(err)
}
diff --git a/pkg/adapters/common/common_test.go b/pkg/adapters/common/common_test.go
deleted file mode 100644
index d2d9f0e..0000000
--- a/pkg/adapters/common/common_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Portions copyright 2019-present Open Networking Foundation
- * Original copyright 2019-present Ciena Corporation
- *
- * Licensed under the Apache License, Version 2.0 (the"github.com/stretchr/testify/assert" "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package common
-
-/*
- * This file has common code that is imported for all test cases, but
- * is not built into production binaries.
- */
-
-import (
- "github.com/opencord/voltha-lib-go/v3/pkg/log"
-)
-
-const (
- /*
- * This sets the LogLevel of the Voltha logger. It's pinned to FatalLevel here, as we
- * generally don't want to see logger output, even when running go test in verbose
- * mode. Even "Error" level messages are expected to be output by some unit tests.
- *
- * If you are developing a unit test, and experiencing problems or wish additional
- * debugging from Voltha, then changing this constant to log.DebugLevel may be
- * useful.
- */
-
- VOLTHA_LOGLEVEL = log.FatalLevel
-)
-
-// Unit test initialization. This init() function will be run once for all unit tests in afrouter
-func init() {
- // Logger must be configured or bad things happen
- _, err := log.SetDefaultLogger(log.JSON, VOLTHA_LOGLEVEL, log.Fields{"instanceId": 1})
- if err != nil {
- panic(err)
- }
-
- _, err = log.AddPackage(log.JSON, VOLTHA_LOGLEVEL, nil)
- if err != nil {
- panic(err)
- }
-}
diff --git a/pkg/adapters/common/core_proxy.go b/pkg/adapters/common/core_proxy.go
index 86f186d..9582f33 100644
--- a/pkg/adapters/common/core_proxy.go
+++ b/pkg/adapters/common/core_proxy.go
@@ -154,7 +154,7 @@
}
func (ap *CoreProxy) PortsStateUpdate(ctx context.Context, deviceId string, operStatus voltha.OperStatus_Types) error {
- log.Debugw("PortsStateUpdate", log.Fields{"deviceId": deviceId})
+ logger.Debugw("PortsStateUpdate", log.Fields{"deviceId": deviceId})
rpc := "PortsStateUpdate"
// Use a device specific topic to send the request. The adapter handling the device creates a device
// specific topic
@@ -202,7 +202,7 @@
func (ap *CoreProxy) DeviceStateUpdate(ctx context.Context, deviceId string,
connStatus voltha.ConnectStatus_Types, operStatus voltha.OperStatus_Types) error {
- log.Debugw("DeviceStateUpdate", log.Fields{"deviceId": deviceId})
+ logger.Debugw("DeviceStateUpdate", log.Fields{"deviceId": deviceId})
rpc := "DeviceStateUpdate"
// Use a device specific topic to send the request. The adapter handling the device creates a device
// specific topic
diff --git a/pkg/adapters/common/utils.go b/pkg/adapters/common/utils.go
index b782ebe..94e8bd6 100644
--- a/pkg/adapters/common/utils.go
+++ b/pkg/adapters/common/utils.go
@@ -84,7 +84,7 @@
case ic.ErrorCode_DEADLINE_EXCEEDED:
return codes.DeadlineExceeded
default:
- log.Warnw("cannnot-map-ic-error-code-to-grpc-error-code", log.Fields{"err": icErr})
+ logger.Warnw("cannnot-map-ic-error-code-to-grpc-error-code", log.Fields{"err": icErr})
return codes.Internal
}
}