small fixes and dependency updates
This commit is contained in:
parent
e95910d920
commit
96405e2521
238 changed files with 3599 additions and 3467 deletions
13
vendor/k8s.io/klog/v2/klogr/klogr.go
generated
vendored
13
vendor/k8s.io/klog/v2/klogr/klogr.go
generated
vendored
|
|
@ -119,27 +119,28 @@ func pretty(value interface{}) string {
|
|||
return strings.TrimSpace(string(buffer.Bytes()))
|
||||
}
|
||||
|
||||
func (l klogger) Info(level int, msg string, kvList ...interface{}) {
|
||||
func (l *klogger) Info(level int, msg string, kvList ...interface{}) {
|
||||
switch l.format {
|
||||
case FormatSerialize:
|
||||
msgStr := flatten("msg", msg)
|
||||
merged := serialize.MergeKVs(l.values, kvList)
|
||||
kvStr := flatten(merged...)
|
||||
klog.V(klog.Level(level)).InfoDepth(l.callDepth+1, l.prefix, " ", msgStr, " ", kvStr)
|
||||
klog.VDepth(l.callDepth+1, klog.Level(level)).InfoDepth(l.callDepth+1, l.prefix, " ", msgStr, " ", kvStr)
|
||||
case FormatKlog:
|
||||
merged := serialize.MergeKVs(l.values, kvList)
|
||||
if l.prefix != "" {
|
||||
msg = l.prefix + ": " + msg
|
||||
}
|
||||
klog.V(klog.Level(level)).InfoSDepth(l.callDepth+1, msg, merged...)
|
||||
klog.VDepth(l.callDepth+1, klog.Level(level)).InfoSDepth(l.callDepth+1, msg, merged...)
|
||||
}
|
||||
}
|
||||
|
||||
func (l klogger) Enabled(level int) bool {
|
||||
return klog.V(klog.Level(level)).Enabled()
|
||||
func (l *klogger) Enabled(level int) bool {
|
||||
// Skip this function and logr.Logger.Info where Enabled is called.
|
||||
return klog.VDepth(l.callDepth+2, klog.Level(level)).Enabled()
|
||||
}
|
||||
|
||||
func (l klogger) Error(err error, msg string, kvList ...interface{}) {
|
||||
func (l *klogger) Error(err error, msg string, kvList ...interface{}) {
|
||||
msgStr := flatten("msg", msg)
|
||||
var loggableErr interface{}
|
||||
if err != nil {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue