[VOL-4760] Log library generalization
Change-Id: I8235413276bdfa07ca6319887b80415077d2ab9d
diff --git a/internal/pkg/controller/addflows.go b/internal/pkg/controller/addflows.go
index 0364341..0d6c27a 100644
--- a/internal/pkg/controller/addflows.go
+++ b/internal/pkg/controller/addflows.go
@@ -22,7 +22,7 @@
"time"
"voltha-go-controller/internal/pkg/of"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
)
const (
diff --git a/internal/pkg/controller/auditdevice.go b/internal/pkg/controller/auditdevice.go
index ea00185..2cabffc 100644
--- a/internal/pkg/controller/auditdevice.go
+++ b/internal/pkg/controller/auditdevice.go
@@ -20,7 +20,7 @@
"time"
"voltha-go-controller/internal/pkg/tasks"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
"github.com/opencord/voltha-protos/v5/go/common"
ofp "github.com/opencord/voltha-protos/v5/go/openflow_13"
)
diff --git a/internal/pkg/controller/audittables.go b/internal/pkg/controller/audittables.go
index 486d560..1afad05 100644
--- a/internal/pkg/controller/audittables.go
+++ b/internal/pkg/controller/audittables.go
@@ -24,7 +24,7 @@
"voltha-go-controller/internal/pkg/of"
"voltha-go-controller/internal/pkg/tasks"
"voltha-go-controller/internal/pkg/util"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
"github.com/opencord/voltha-protos/v5/go/common"
ofp "github.com/opencord/voltha-protos/v5/go/openflow_13"
"github.com/opencord/voltha-protos/v5/go/voltha"
@@ -306,7 +306,7 @@
var present bool
if flow.FlowMod != nil {
if dbFlow, present = att.device.GetFlow(flow.FlowMod.Cookie); !present {
- logger.Warn(ctx, "Flow Removed from DB. Ignoring Add Missing Flow", log.Fields{"Device": att.device.ID, "Cookie": flow.FlowMod.Cookie})
+ logger.Warnw(ctx, "Flow Removed from DB. Ignoring Add Missing Flow", log.Fields{"Device": att.device.ID, "Cookie": flow.FlowMod.Cookie})
continue
}
}
@@ -332,7 +332,7 @@
for _, flow := range flows {
if _, present := att.device.GetFlow(flow.Cookie); present {
- logger.Warn(ctx, "Flow Present in DB. Ignoring Delete Excess Flow", log.Fields{"Device": att.device.ID, "Cookie": flow.Cookie})
+ logger.Warnw(ctx, "Flow Present in DB. Ignoring Delete Excess Flow", log.Fields{"Device": att.device.ID, "Cookie": flow.Cookie})
continue
}
diff --git a/internal/pkg/controller/changeevent.go b/internal/pkg/controller/changeevent.go
index 95f6b07..21ed05d 100644
--- a/internal/pkg/controller/changeevent.go
+++ b/internal/pkg/controller/changeevent.go
@@ -20,7 +20,7 @@
"errors"
"time"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
ofp "github.com/opencord/voltha-protos/v5/go/openflow_13"
)
diff --git a/internal/pkg/controller/controller.go b/internal/pkg/controller/controller.go
index ae34133..9abbd42 100644
--- a/internal/pkg/controller/controller.go
+++ b/internal/pkg/controller/controller.go
@@ -31,7 +31,7 @@
"voltha-go-controller/internal/pkg/util"
"voltha-go-controller/internal/pkg/vpagent"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
)
var logger log.CLogger
@@ -40,7 +40,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)
}
diff --git a/internal/pkg/controller/controllertasks.go b/internal/pkg/controller/controllertasks.go
index bd06ffb..50a51ee 100644
--- a/internal/pkg/controller/controllertasks.go
+++ b/internal/pkg/controller/controllertasks.go
@@ -22,7 +22,7 @@
"voltha-go-controller/internal/pkg/intf"
"voltha-go-controller/internal/pkg/vpagent"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
)
// AddDeviceTask structure
diff --git a/internal/pkg/controller/device.go b/internal/pkg/controller/device.go
index aa7bd2c..cea6960 100644
--- a/internal/pkg/controller/device.go
+++ b/internal/pkg/controller/device.go
@@ -31,7 +31,7 @@
//"voltha-go-controller/internal/pkg/vpagent"
"voltha-go-controller/internal/pkg/tasks"
"voltha-go-controller/internal/pkg/util"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
ofp "github.com/opencord/voltha-protos/v5/go/openflow_13"
"github.com/opencord/voltha-protos/v5/go/voltha"
)
diff --git a/internal/pkg/controller/modgroup.go b/internal/pkg/controller/modgroup.go
index 49da920..e51a347 100644
--- a/internal/pkg/controller/modgroup.go
+++ b/internal/pkg/controller/modgroup.go
@@ -23,7 +23,7 @@
infraerrorcode "voltha-go-controller/internal/pkg/errorcodes/service"
"voltha-go-controller/internal/pkg/of"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
"google.golang.org/grpc/codes"
)
diff --git a/internal/pkg/controller/modmeter.go b/internal/pkg/controller/modmeter.go
index 04b1e04..b5ce86c 100644
--- a/internal/pkg/controller/modmeter.go
+++ b/internal/pkg/controller/modmeter.go
@@ -20,7 +20,7 @@
"time"
"voltha-go-controller/internal/pkg/of"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
)
// ModMeterTask structure
@@ -82,7 +82,7 @@
// log.Fields{"meterId": mmt.meter.ID, "meterOp": mmt.command, "Status": statusCode, "errorReason": statusMsg})
// go mmt.device.AddMeterToDb(mmt.meter)
// } else {
- // log.Infow("Meter Mod Result", log.Fields{"meterID": mmt.meter.ID, "Error Code": statusCode})
+ // logger.Infow("Meter Mod Result", log.Fields{"meterID": mmt.meter.ID, "Error Code": statusCode})
// }
// }
diff --git a/internal/pkg/controller/pendingprofiles.go b/internal/pkg/controller/pendingprofiles.go
index 6258f36..a97cdfa 100644
--- a/internal/pkg/controller/pendingprofiles.go
+++ b/internal/pkg/controller/pendingprofiles.go
@@ -19,7 +19,7 @@
"context"
"time"
- "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "voltha-go-controller/log"
)
// PendingProfilesTask structure