status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2621 from alicebob/devwatch 

reset watch's lastIndex on error
This commit is contained in:
James Phillips 2017-06-02 09:06:02 -07:00 committed by GitHub
parent 68cac3d40c d7b5f41447
commit 5f9776ac89
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
watch/plan.go
View File

@ -57,6 +57,7 @@ OUTER:
if err != nil { if err != nil {
// Perform an exponential backoff // Perform an exponential backoff
failures++ failures++
p.lastIndex = 0
retry := retryInterval * time.Duration(failures*failures) retry := retryInterval * time.Duration(failures*failures)
if retry > maxBackoffTime { if retry > maxBackoffTime {
retry = maxBackoffTime retry = maxBackoffTime
@ -85,6 +86,9 @@ OUTER:
if oldIndex != 0 && reflect.DeepEqual(p.lastResult, result) { if oldIndex != 0 && reflect.DeepEqual(p.lastResult, result) {
continue continue
} }
if p.lastIndex < oldIndex {
p.lastIndex = 0
}
// Handle the updated result // Handle the updated result
p.lastResult = result p.lastResult = result