lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util: Port all multierr code to new errwrap package

Browse Source 
This cleans things up and simplifies a lot of the code. Also it's easier
to just import one error package when needed.
This commit is contained in:
James Shubin
2019-03-12 16:51:37 -04:00
parent 880652f5d4
commit 753d1104ef
21 changed files with 83 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
langpuppet/gapi.go
View File

@@ -29,7 +29,6 @@ import (
"github.com/purpleidea/mgmt/puppet"
"github.com/purpleidea/mgmt/util/errwrap"
multierr "github.com/hashicorp/go-multierror"
"github.com/urfave/cli"
)
@@ -329,12 +328,11 @@ func (obj *GAPI) Close() error {
}
var err error
if e := obj.langGAPI.Close(); e != nil {
err = multierr.Append(err, errwrap.Wrapf(e, "closing lang GAPI failed"))
}
if e := obj.puppetGAPI.Close(); e != nil {
err = multierr.Append(err, errwrap.Wrapf(e, "closing Puppet GAPI failed"))
}
e1 := obj.langGAPI.Close()
err = errwrap.Append(err, errwrap.Wrapf(e1, "closing lang GAPI failed"))
e2 := obj.puppetGAPI.Close()
err = errwrap.Append(err, errwrap.Wrapf(e2, "closing Puppet GAPI failed"))
close(obj.closeChan)
obj.initialized = false // closed = true