unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

Simplified delService code; properly delete service nodes

Browse Source
This commit is contained in:
Milos Gajdos
2019-06-18 21:39:00 +01:00
parent 7266c62d09
commit c0a628d65b
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
registry/gossip/util.go
View File

@@ -115,27 +115,20 @@ func delNodes(old, del []*registry.Node) []*registry.Node {
func delServices(old, del []*registry.Service) []*registry.Service { func delServices(old, del []*registry.Service) []*registry.Service {
var services []*registry.Service var services []*registry.Service
for _, o := range old { for _, o := range old {
srv := new(registry.Service)
*srv = *o
var rem bool var rem bool
for _, s := range del { for _, s := range del {
if srv.Version == s.Version { if o.Version == s.Version {
srv.Nodes = delNodes(srv.Nodes, s.Nodes) s.Nodes = delNodes(s.Nodes, o.Nodes)
if len(s.Nodes) == 0 {
if len(srv.Nodes) == 0 {
rem = true rem = true
break
} }
} }
} }
if !rem { if !rem {
services = append(services, srv) services = append(services, o)
} }
} }
return services return services
} }