status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8437 from hashicorp/dnephin/fix-service-checks-cache-type 

cache-type: Return nil value on error
This commit is contained in:
Daniel Nephin 2020-08-05 13:50:05 -04:00 committed by GitHub
parent da799c6a59 ba3ace1219
commit 136cb82158
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/cache-types/service_checks.go
View File

@ -60,7 +60,7 @@ func (c *ServiceHTTPChecks) Fetch(opts cache.FetchOptions, req cache.Request) (c
sid := structs.NewServiceID(reqReal.ServiceID, &reqReal.EnterpriseMeta) sid := structs.NewServiceID(reqReal.ServiceID, &reqReal.EnterpriseMeta)
svcState := c.Agent.LocalState().ServiceState(sid) svcState := c.Agent.LocalState().ServiceState(sid)
if svcState == nil { if svcState == nil {
return "", result, fmt.Errorf("Internal cache failure: service '%s' not in agent state", reqReal.ServiceID) return "", nil, fmt.Errorf("Internal cache failure: service '%s' not in agent state", reqReal.ServiceID)
} }
// WatchCh will receive updates on service (de)registrations and check (de)registrations // WatchCh will receive updates on service (de)registrations and check (de)registrations
@ -70,7 +70,7 @@ func (c *ServiceHTTPChecks) Fetch(opts cache.FetchOptions, req cache.Request) (c
hash, err := hashChecks(reply) hash, err := hashChecks(reply)
if err != nil { if err != nil {
return "", result, fmt.Errorf("Internal cache failure: %v", err) return "", nil, fmt.Errorf("Internal cache failure: %v", err)
} }
return hash, reply, nil return hash, reply, nil