go/go-micro
1
0
Fork 0
mirror of https://github.com/go-micro/go-micro.git synced 2024-12-24 10:07:04 +02:00
Code Issues Releases Activity

In the event watchRegistry or watchTable exit then close the go routines

Browse Source
This commit is contained in:
Asim Aslam 2019-08-02 15:17:48 +01:00
parent 6719f8d655
commit d250ac736f
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
network/router/default.go
View File

@ -177,10 +177,24 @@ func (r *router) watchRegistry(w registry.Watcher) error {
// wait in the background for the router to stop
// when the router stops, stop the watcher and exit
r.wg.Add(1)
exit := make(chan bool)
defer func() {
// close the exit channel when the go routine finishes
close(exit)
r.wg.Done()
}()
go func() {
defer r.wg.Done()
<-r.exit
w.Stop()
defer w.Stop()
select {
case <-r.exit:
return
case <-exit:
return
}
}()
var watchErr error
@ -208,10 +222,23 @@ func (r *router) watchTable(w Watcher) error {
// wait in the background for the router to stop
// when the router stops, stop the watcher and exit
r.wg.Add(1)
exit := make(chan bool)
defer func() {
// close the exit channel when the go routine finishes
close(exit)
r.wg.Done()
}()
go func() {
defer r.wg.Done()
<-r.exit
w.Stop()
defer w.Stop()
select {
case <-r.exit:
return
case <-exit:
return
}
}()
var watchErr error