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

Update registry util semantics

Browse Source
This commit is contained in:
Asim Aslam
2019-07-04 11:36:49 +01:00
parent 59a0e727e4
commit a412486c39
5 changed files with 71 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
registry/memory/memory.go
View File

@@ -55,7 +55,7 @@ func (m *Registry) Init(opts ...registry.Option) error {
m.Lock()
for k, v := range getServices(m.options.Context) {
s := m.Services[k]
m.Services[k] = registry.AddServices(s, v)
m.Services[k] = registry.Merge(s, v)
}
m.Unlock()
return nil
@@ -92,7 +92,7 @@ func (m *Registry) Register(s *registry.Service, opts ...registry.RegisterOption
if service, ok := m.Services[s.Name]; !ok {
m.Services[s.Name] = []*registry.Service{s}
} else {
m.Services[s.Name] = registry.AddServices(service, []*registry.Service{s})
m.Services[s.Name] = registry.Merge(service, []*registry.Service{s})
}
m.Unlock()
@@ -104,7 +104,7 @@ func (m *Registry) Deregister(s *registry.Service) error {
m.Lock()
if service, ok := m.Services[s.Name]; ok {
if service := registry.DelServices(service, []*registry.Service{s}); len(service) == 0 {
if service := registry.Remove(service, []*registry.Service{s}); len(service) == 0 {
delete(m.Services, s.Name)
} else {
m.Services[s.Name] = service