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

Merge pull request #823 from micro/list-services

Browse Source 
Support listing full service info in etcd
This commit is contained in:
Asim Aslam
2019-10-07 16:15:30 +01:00
committed by GitHub
parent fa6590f999 e9dcff49e0
commit e4f8b5de70
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
registry/etcd/etcd.go
View File

@@ -349,7 +349,7 @@ func (e *etcdRegistry) GetService(name string) ([]*registry.Service, error) {
func (e *etcdRegistry) ListServices() ([]*registry.Service, error) { func (e *etcdRegistry) ListServices() ([]*registry.Service, error) {
var services []*registry.Service var services []*registry.Service
nameSet := make(map[string]struct{}) versions := make(map[string]*registry.Service)
ctx, cancel := context.WithTimeout(context.Background(), e.options.Timeout) ctx, cancel := context.WithTimeout(context.Background(), e.options.Timeout)
defer cancel() defer cancel()
@@ -364,13 +364,20 @@ func (e *etcdRegistry) ListServices() ([]*registry.Service, error) {
} }
for _, n := range rsp.Kvs { for _, n := range rsp.Kvs {
if sn := decode(n.Value); sn != nil { sn := decode(n.Value)
nameSet[sn.Name] = struct{}{} if sn == nil {
continue
} }
v, ok := versions[sn.Name+sn.Version]
if !ok {
versions[sn.Name+sn.Version] = sn
continue
}
// append to service:version nodes
v.Nodes = append(v.Nodes, sn.Nodes...)
} }
for k := range nameSet {
service := &registry.Service{} for _, service := range versions {
service.Name = k
services = append(services, service) services = append(services, service)
} }