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

cleanup router watcher logic

Browse Source
This commit is contained in:
Asim Aslam 2020-08-08 01:04:38 +01:00
parent e7cc3c2210
commit fc67593ee4
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
router/registry/registry.go
View File

@ -570,19 +570,12 @@ func (r *rtr) start() error {
}() }()
go func() { go func() {
var err error
var w registry.Watcher
for { for {
select { select {
case <-r.exit: case <-r.exit:
if w != nil {
w.Stop()
}
return return
default: default:
if w == nil { w, err := r.options.Registry.Watch(registry.WatchDomain(registry.WildcardDomain))
w, err = r.options.Registry.Watch(registry.WatchDomain(registry.WildcardDomain))
if err != nil { if err != nil {
if logger.V(logger.WarnLevel, logger.DefaultLogger) { if logger.V(logger.WarnLevel, logger.DefaultLogger) {
logger.Warnf("failed creating registry watcher: %v", err) logger.Warnf("failed creating registry watcher: %v", err)
@ -590,19 +583,14 @@ func (r *rtr) start() error {
time.Sleep(time.Second) time.Sleep(time.Second)
continue continue
} }
}
// watchRegistry calls stop when it's done
if err := r.watchRegistry(w); err != nil { if err := r.watchRegistry(w); err != nil {
if logger.V(logger.WarnLevel, logger.DefaultLogger) { if logger.V(logger.WarnLevel, logger.DefaultLogger) {
logger.Warnf("Error watching the registry: %v", err) logger.Warnf("Error watching the registry: %v", err)
} }
time.Sleep(time.Second) time.Sleep(time.Second)
} }
if w != nil {
w.Stop()
w = nil
}
} }
} }
}() }()