github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3410 from brendandburns/watch

Browse Source 
Clear resourceVersion on errors.
This commit is contained in:
Daniel Smith
2015-01-12 11:51:59 -08:00
parent fa152ab3f1 6ad88bb143
commit 969c4b8c49
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/proxy/config/api.go
View File

@@ -127,9 +127,11 @@ func handleServicesWatch(resourceVersion *string, ch <-chan watch.Event, updates
service = obj
case *api.Status:
glog.Warningf("Got error status on WatchServices channel: %+v", obj)
*resourceVersion = ""
return
default:
glog.Errorf("Got unexpected object over WatchServices channel: %+v", obj)
*resourceVersion = ""
return
}
@@ -196,9 +198,11 @@ func handleEndpointsWatch(resourceVersion *string, ch <-chan watch.Event, update
endpoints = obj
case *api.Status:
glog.Warningf("Got error status on WatchEndpoints channel: %+v", obj)
*resourceVersion = ""
return
default:
glog.Errorf("Got unexpected object over WatchEndpoints channel: %+v", obj)
*resourceVersion = ""
return
}
*resourceVersion = endpoints.ResourceVersion