From 06efd86142bf6995b088597a0df380da45fb5aef Mon Sep 17 00:00:00 2001 From: pacoxu Date: Thu, 18 Feb 2021 19:06:34 +0800 Subject: [PATCH] Migrate client-go retry-watcher to structured logging Co-authored-by: Marek Siarkowicz Kubernetes-commit: c4dc34e8cbad41968c50763f79280e7cd14dabee --- tools/watch/retrywatcher.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/watch/retrywatcher.go b/tools/watch/retrywatcher.go index 62af45de..1ed46ccb 100644 --- a/tools/watch/retrywatcher.go +++ b/tools/watch/retrywatcher.go @@ -116,24 +116,24 @@ func (rw *RetryWatcher) doReceive() (bool, time.Duration) { return false, 0 case io.ErrUnexpectedEOF: - klog.V(1).Infof("Watch closed with unexpected EOF: %v", err) + klog.V(1).InfoS("Watch closed with unexpected EOF", "err", err) return false, 0 default: - msg := "Watch failed: %v" + msg := "Watch failed" if net.IsProbableEOF(err) || net.IsTimeout(err) { - klog.V(5).Infof(msg, err) + klog.V(5).InfoS(msg, "err", err) // Retry return false, 0 } - klog.Errorf(msg, err) + klog.ErrorS(err, msg) // Retry return false, 0 } if watcher == nil { - klog.Error("Watch returned nil watcher") + klog.ErrorS(nil, "Watch returned nil watcher") // Retry return false, 0 } @@ -144,11 +144,11 @@ func (rw *RetryWatcher) doReceive() (bool, time.Duration) { for { select { case <-rw.stopChan: - klog.V(4).Info("Stopping RetryWatcher.") + klog.V(4).InfoS("Stopping RetryWatcher.") return true, 0 case event, ok := <-ch: if !ok { - klog.V(4).Infof("Failed to get event! Re-creating the watcher. Last RV: %s", rw.lastResourceVersion) + klog.V(4).InfoS("Failed to get event! Re-creating the watcher.", "resourceVersion", rw.lastResourceVersion) return false, 0 }