VOL-2509 - upodate to use v3 protobufs
Change-Id: Ie42573675d7ef6c58757933023943ee133aaf3aa
diff --git a/vendor/github.com/opencord/voltha-lib-go/v2/pkg/log/log.go b/vendor/github.com/opencord/voltha-lib-go/v3/pkg/log/log.go
similarity index 95%
rename from vendor/github.com/opencord/voltha-lib-go/v2/pkg/log/log.go
rename to vendor/github.com/opencord/voltha-lib-go/v3/pkg/log/log.go
index fe3a4e0..43567e3 100644
--- a/vendor/github.com/opencord/voltha-lib-go/v2/pkg/log/log.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v3/pkg/log/log.go
@@ -59,8 +59,6 @@
WarnLevel
// ErrorLevel logs a message at error level
ErrorLevel
- // PanicLevel logs a message, then panics.
- PanicLevel
// FatalLevel logs a message, then calls os.Exit(1).
FatalLevel
)
@@ -109,6 +107,9 @@
// V reports whether verbosity level l is at least the requested verbose level.
V(l int) bool
+
+ //Returns the log level of this specific logger
+ GetLogLevel() int
}
// Fields is used as key-value pairs for structured logging
@@ -121,8 +122,9 @@
var cfgs map[string]zp.Config
type logger struct {
- log *zp.SugaredLogger
- parent *zp.Logger
+ log *zp.SugaredLogger
+ parent *zp.Logger
+ packageName string
}
func intToAtomicLevel(l int) zp.AtomicLevel {
@@ -135,8 +137,6 @@
return zp.NewAtomicLevelAt(zc.WarnLevel)
case ErrorLevel:
return zp.NewAtomicLevelAt(zc.ErrorLevel)
- case PanicLevel:
- return zp.NewAtomicLevelAt(zc.PanicLevel)
case FatalLevel:
return zp.NewAtomicLevelAt(zc.FatalLevel)
}
@@ -153,8 +153,6 @@
return zc.WarnLevel
case ErrorLevel:
return zc.ErrorLevel
- case PanicLevel:
- return zc.PanicLevel
case FatalLevel:
return zc.FatalLevel
}
@@ -171,9 +169,23 @@
return WarnLevel
case zc.ErrorLevel:
return ErrorLevel
- case zc.PanicLevel:
- return PanicLevel
- case FatalLevel:
+ case zc.FatalLevel:
+ return FatalLevel
+ }
+ return ErrorLevel
+}
+
+func StringToInt(l string) int {
+ switch l {
+ case "DEBUG":
+ return DebugLevel
+ case "INFO":
+ return InfoLevel
+ case "WARN":
+ return WarnLevel
+ case "ERROR":
+ return ErrorLevel
+ case "FATAL":
return FatalLevel
}
return ErrorLevel
@@ -258,8 +270,9 @@
}
loggers[pkgName] = &logger{
- log: l.Sugar(),
- parent: l,
+ log: l.Sugar(),
+ parent: l,
+ packageName: pkgName,
}
return loggers[pkgName], nil
}
@@ -279,8 +292,9 @@
}
loggers[pkgName] = &logger{
- log: l.Sugar(),
- parent: l,
+ log: l.Sugar(),
+ parent: l,
+ packageName: pkgName,
}
}
return nil
@@ -326,8 +340,9 @@
// Set the logger
loggers[pkgName] = &logger{
- log: l.Sugar(),
- parent: l,
+ log: l.Sugar(),
+ parent: l,
+ packageName: pkgName,
}
return loggers[pkgName], nil
}
@@ -342,8 +357,6 @@
cfg.Level.SetLevel(zc.WarnLevel)
case ErrorLevel:
cfg.Level.SetLevel(zc.ErrorLevel)
- case PanicLevel:
- cfg.Level.SetLevel(zc.PanicLevel)
case FatalLevel:
cfg.Level.SetLevel(zc.FatalLevel)
default:
@@ -632,6 +645,11 @@
return l.parent.Core().Enabled(intToLevel(level))
}
+// GetLogLevel returns the current level of the logger
+func (l logger) GetLogLevel() int {
+ return levelToInt(cfgs[l.packageName].Level.Level())
+}
+
// With returns a logger initialized with the key-value pairs
func With(keysAndValues Fields) Logger {
return logger{log: getPackageLevelSugaredLogger().With(serializeMap(keysAndValues)...), parent: defaultLogger.parent}
@@ -761,3 +779,8 @@
func V(level int) bool {
return getPackageLevelLogger().V(level)
}
+
+//GetLogLevel returns the log level of the invoking package
+func GetLogLevel() int {
+ return getPackageLevelLogger().GetLogLevel()
+}
diff --git a/vendor/github.com/opencord/voltha-lib-go/v2/pkg/probe/probe.go b/vendor/github.com/opencord/voltha-lib-go/v3/pkg/probe/probe.go
similarity index 99%
rename from vendor/github.com/opencord/voltha-lib-go/v2/pkg/probe/probe.go
rename to vendor/github.com/opencord/voltha-lib-go/v3/pkg/probe/probe.go
index 7e6dbf9..9f00953 100644
--- a/vendor/github.com/opencord/voltha-lib-go/v2/pkg/probe/probe.go
+++ b/vendor/github.com/opencord/voltha-lib-go/v3/pkg/probe/probe.go
@@ -18,7 +18,7 @@
import (
"context"
"fmt"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
"net/http"
"sync"
)
diff --git a/vendor/github.com/opencord/voltha-lib-go/v2/pkg/version/version.go b/vendor/github.com/opencord/voltha-lib-go/v3/pkg/version/version.go
similarity index 100%
rename from vendor/github.com/opencord/voltha-lib-go/v2/pkg/version/version.go
rename to vendor/github.com/opencord/voltha-lib-go/v3/pkg/version/version.go