github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1989 from hashicorp/persist-errors 

Fixes some bad error returns in the persist service and check paths.
pull/1996/head
James Phillips 2016-04-26 15:04:20 -07:00
parent adcf935350 7bf684ece1
commit 178d58721a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
command/agent/agent.go
View File

@ -669,7 +669,7 @@ func (a *Agent) persistService(service *structs.NodeService) error {
}
encoded, err := json.Marshal(wrapped)
if err != nil {
return nil
return err
}
if err := os.MkdirAll(filepath.Dir(svcPath), 0700); err != nil {
return err
@ -707,7 +707,7 @@ func (a *Agent) persistCheck(check *structs.HealthCheck, chkType *CheckType) err
encoded, err := json.Marshal(wrapped)
if err != nil {
return nil
return err
}
if err := os.MkdirAll(filepath.Dir(checkPath), 0700); err != nil {
return err