unistack-org/micro
3
0
Fork 2
Code Issues 20 Pull Requests 2 Actions Packages Projects Releases 294 Wiki Activity

Return registry.ErrWatcherStopped when consul watcher stops.

Browse Source 
The original code returns "result chan closed" errors.Error which does
not carry higher semantics signal to downstream despite go-micro having
a clearly defined Error for this behaviour. This commit fixes that and
lets the downstream i.e. consumer of this code to act based on different
errors.
This commit is contained in:
Milos Gajdos 2019-06-09 15:51:27 +01:00
parent 7c4515d748
commit 73b0a0ed0e
No known key found for this signature in database
GPG Key ID: 8B31058CC55DFD4F
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
registry/consul/watcher.go
View File

@ -1,7 +1,6 @@
package consul package consul
import ( import (
"errors"
"log" "log"
"os" "os"
"sync" "sync"
@ -246,14 +245,16 @@ func (cw *consulWatcher) handle(idx uint64, data interface{}) {
func (cw *consulWatcher) Next() (*registry.Result, error) { func (cw *consulWatcher) Next() (*registry.Result, error) {
select { select {
case <-cw.exit: case <-cw.exit:
return nil, errors.New("result chan closed") return nil, registry.ErrWatcherStopped
case r, ok := <-cw.next: case r, ok := <-cw.next:
if !ok { if !ok {
return nil, errors.New("result chan closed") return nil, registry.ErrWatcherStopped
} }
return r, nil return r, nil
} }
return nil, errors.New("result chan closed") // NOTE: This is a dead code path: e.g. it will never be reached
// as we return in all previous code paths never leading to this return
return nil, registry.ErrWatcherStopped
} }
func (cw *consulWatcher) Stop() { func (cw *consulWatcher) Stop() {