[VOL-4760] Log library generalization
Change-Id: I8235413276bdfa07ca6319887b80415077d2ab9d
diff --git a/internal/pkg/vpagent/changeEvent.go b/internal/pkg/vpagent/changeEvent.go
index 3d86675..9300671 100644
--- a/internal/pkg/vpagent/changeEvent.go
+++ b/internal/pkg/vpagent/changeEvent.go
@@ -20,7 +20,7 @@
"io"
"github.com/golang/protobuf/ptypes/empty"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
"google.golang.org/grpc"
)
diff --git a/internal/pkg/vpagent/common.go b/internal/pkg/vpagent/common.go
index d32e0a6..5b62368 100644
--- a/internal/pkg/vpagent/common.go
+++ b/internal/pkg/vpagent/common.go
@@ -20,20 +20,10 @@
"context"
"strings"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
-func init() {
- // Setup this package so that it's log level can be modified at run time
- var err error
- logger, err = log.RegisterPackage(log.JSON, log.ErrorLevel, log.Fields{})
- if err != nil {
- panic(err)
- }
-}
-
// IsConnCanceled returns true, if error is from a closed gRPC connection.
// ref. https://github.com/grpc/grpc-go/pull/1854
func isConnCanceled(err error) bool {
diff --git a/internal/pkg/vpagent/connection.go b/internal/pkg/vpagent/connection.go
index 607f7f3..9e93ae2 100644
--- a/internal/pkg/vpagent/connection.go
+++ b/internal/pkg/vpagent/connection.go
@@ -21,7 +21,7 @@
"time"
"github.com/golang/protobuf/ptypes/empty"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
"github.com/opencord/voltha-lib-go/v7/pkg/probe"
"github.com/opencord/voltha-protos/v5/go/voltha"
"google.golang.org/grpc"
diff --git a/internal/pkg/vpagent/packetIn.go b/internal/pkg/vpagent/packetIn.go
index 4a2f7c3..81f6ff2 100644
--- a/internal/pkg/vpagent/packetIn.go
+++ b/internal/pkg/vpagent/packetIn.go
@@ -20,7 +20,7 @@
"io"
"github.com/golang/protobuf/ptypes/empty"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
"google.golang.org/grpc"
)
diff --git a/internal/pkg/vpagent/packetOut.go b/internal/pkg/vpagent/packetOut.go
index 501bdea..ac9fa8b 100644
--- a/internal/pkg/vpagent/packetOut.go
+++ b/internal/pkg/vpagent/packetOut.go
@@ -18,7 +18,7 @@
import (
"context"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
"google.golang.org/grpc"
)
@@ -47,9 +47,7 @@
case <-ctx.Done():
break top
case ofPacketOut := <-vpa.packetOutChannel:
- if logger.V(log.DebugLevel) {
- logger.Debug(ctx, "streamPacketOut Receive PacketOut from Channel")
- }
+ logger.Debug(ctx, "streamPacketOut Receive PacketOut from Channel")
if err := outClient.Send(ofPacketOut); err != nil {
logger.Errorw(ctx, "packet-out-send-error",
log.Fields{"error": err.Error()})
diff --git a/internal/pkg/vpagent/refresh.go b/internal/pkg/vpagent/refresh.go
index c06e5cd..83792d0 100644
--- a/internal/pkg/vpagent/refresh.go
+++ b/internal/pkg/vpagent/refresh.go
@@ -22,7 +22,7 @@
"voltha-go-controller/internal/pkg/intf"
"github.com/golang/protobuf/ptypes/empty"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
"github.com/opencord/voltha-protos/v5/go/voltha"
)
diff --git a/internal/pkg/vpagent/volthaprotoagent.go b/internal/pkg/vpagent/volthaprotoagent.go
index 04e3d08..6a3dcd4 100644
--- a/internal/pkg/vpagent/volthaprotoagent.go
+++ b/internal/pkg/vpagent/volthaprotoagent.go
@@ -24,7 +24,7 @@
"voltha-go-controller/internal/pkg/holder"
"voltha-go-controller/internal/pkg/intf"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
"github.com/opencord/voltha-lib-go/v7/pkg/probe"
ofp "github.com/opencord/voltha-protos/v5/go/openflow_13"
"github.com/opencord/voltha-protos/v5/go/voltha"
@@ -37,7 +37,7 @@
func init() {
// Setup this package so that it's log level can be modified at run time
var err error
- logger, err = log.RegisterPackage(log.JSON, log.ErrorLevel, log.Fields{})
+ logger, err = log.AddPackageWithDefaultParam()
if err != nil {
panic(err)
}