unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 259 Wiki Activity

initChan is never evaluated because watchRegistry is a blocking call

Browse Source
This commit is contained in:
Asim Aslam 2020-08-07 23:44:43 +01:00
parent 9b14eb8aec
commit 712fe39a62
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
router/registry/registry.go
View File

@ -272,6 +272,8 @@ func (r *rtr) watchRegistry(w registry.Watcher) error {
select { select {
case <-exit: case <-exit:
return return
case <-r.initChan:
return
case <-r.exit: case <-r.exit:
return return
} }
@ -578,14 +580,6 @@ func (r *rtr) start() error {
w.Stop() w.Stop()
} }
return return
case <-r.initChan:
// the registry could have changed during initialization
// so if there was a watcher setup, stop it and create a
// new one
if w != nil {
w.Stop()
w = nil
}
default: default:
if w == nil { if w == nil {
w, err = r.options.Registry.Watch(registry.WatchDomain(registry.WildcardDomain)) w, err = r.options.Registry.Watch(registry.WatchDomain(registry.WildcardDomain))