luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fixup stray sid references

This commit is contained in:
freddygv 2020-06-12 09:34:02 -06:00
parent 26583e12ba
commit cc4ff3ae02
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
agent/consul/state/catalog.go
View File

@ -879,8 +879,8 @@ func (s *Store) serviceListTxn(tx *memdb.Txn, ws memdb.WatchSet, entMeta *struct
} }
results := make(structs.ServiceList, 0, len(unique)) results := make(structs.ServiceList, 0, len(unique))
for sid, _ := range unique { for sn, _ := range unique {
results = append(results, structs.ServiceName{Name: sid.Name, EnterpriseMeta: sid.EnterpriseMeta}) results = append(results, structs.ServiceName{Name: sn.Name, EnterpriseMeta: sn.EnterpriseMeta})
} }
return idx, results, nil return idx, results, nil
@ -2020,8 +2020,8 @@ func (s *Store) CheckIngressServiceNodes(ws memdb.WatchSet, serviceName string,
} }
var results structs.CheckServiceNodes var results structs.CheckServiceNodes
for sid := range names { for sn := range names {
idx, n, err := s.checkServiceNodesTxn(tx, ws, sid.Name, false, &sid.EnterpriseMeta) idx, n, err := s.checkServiceNodesTxn(tx, ws, sn.Name, false, &sn.EnterpriseMeta)
if err != nil { if err != nil {
return 0, nil, err return 0, nil, err
} }