github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-06-28 16:07:29 +00:00
Code Issues Projects Releases Wiki Activity

Migrate client-go retry-watcher to structured logging

Browse Source 
Co-authored-by: Marek Siarkowicz <marek.siarkowicz@protonmail.com>

Kubernetes-commit: c4dc34e8cbad41968c50763f79280e7cd14dabee
This commit is contained in:
pacoxu 2021-02-18 19:06:34 +08:00 committed by Kubernetes Publisher
parent 12449b5492
commit 06efd86142
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/watch/retrywatcher.go
View File

@ -116,24 +116,24 @@ func (rw *RetryWatcher) doReceive() (bool, time.Duration) {
return false, 0 return false, 0
case io.ErrUnexpectedEOF: 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 return false, 0
default: default:
msg := "Watch failed: %v" msg := "Watch failed"
if net.IsProbableEOF(err) || net.IsTimeout(err) { if net.IsProbableEOF(err) || net.IsTimeout(err) {
klog.V(5).Infof(msg, err) klog.V(5).InfoS(msg, "err", err)
// Retry // Retry
return false, 0 return false, 0
} }
klog.Errorf(msg, err) klog.ErrorS(err, msg)
// Retry // Retry
return false, 0 return false, 0
} }
if watcher == nil { if watcher == nil {
klog.Error("Watch returned nil watcher") klog.ErrorS(nil, "Watch returned nil watcher")
// Retry // Retry
return false, 0 return false, 0
} }
@ -144,11 +144,11 @@ func (rw *RetryWatcher) doReceive() (bool, time.Duration) {
for { for {
select { select {
case <-rw.stopChan: case <-rw.stopChan:
klog.V(4).Info("Stopping RetryWatcher.") klog.V(4).InfoS("Stopping RetryWatcher.")
return true, 0 return true, 0
case event, ok := <-ch: case event, ok := <-ch:
if !ok { 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 return false, 0
} }