switch error package to fault
3 files changed, 10 insertions(+), 9 deletions(-)
changed files
M go.mod → go.mod
@@ -3,15 +3,16 @@ go 1.22.3 require ( + github.com/Southclaws/fault v0.8.2 github.com/sykesm/zap-logfmt v0.0.4 github.com/thessem/zap-prettyconsole v0.5.2 - gitlab.com/tozd/go/errors v0.10.0 go.uber.org/zap v1.27.0 moul.io/zapfilter v1.7.0 ) require ( github.com/Code-Hex/dd v1.1.0 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/pkg/errors v0.9.1 // indirect go.uber.org/multierr v1.11.0 // indirect )
M go.sum → go.sum
@@ -1,6 +1,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Code-Hex/dd v1.1.0 h1:VEtTThnS9l7WhpKUIpdcWaf0B8Vp0LeeSEsxA1DZseI= github.com/Code-Hex/dd v1.1.0/go.mod h1:VaMyo/YjTJ3d4qm/bgtrUkT2w+aYwJ07Y7eCWyrJr1w= +github.com/Southclaws/fault v0.8.2 h1:hbQANoRWYVWnQjpwJlNlfaolM+oIihgoFowaY3EBLCs= +github.com/Southclaws/fault v0.8.2/go.mod h1:VUVkAWutC59SL16s6FTqf3I6I2z77RmnaW5XRz4bLOE= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=@@ -33,8 +35,6 @@ github.com/thessem/zap-prettyconsole v0.5.2 h1:knusxXGhmkD5Ho+WiI4IzD16Dz9PEcOIKdK+uX4oTPA= github.com/thessem/zap-prettyconsole v0.5.2/go.mod h1:3qfsE7y+bLOq7EQ+fMZHD3HYEp24ULFf5nhLSx6rjrE= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -gitlab.com/tozd/go/errors v0.10.0 h1:A98kL+gaDvWnY6ZB/u8zP+sYaWsWUGBHeFMtamvW/74= -gitlab.com/tozd/go/errors v0.10.0/go.mod h1:q3Ugr0C8dCzMEkrzjjlV2qNsm9e0KvqBjwcbcjCpBe4= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.8.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
M listenfd/listenfd.go → listenfd/listenfd.go
@@ -7,8 +7,8 @@ "os" "strconv" "alin.ovh/x/log" - - "gitlab.com/tozd/go/errors" + "github.com/Southclaws/fault" + "github.com/Southclaws/fault/fmsg" ) const fdStart = 3@@ -23,7 +23,7 @@ log.Debug("listener from listenfd?", "passed", l != nil) if l == nil { l, err = net.Listen("tcp", addr) if err != nil { - return nil, errors.Wrap(err, "could not create listener") + return nil, fault.Wrap(err, fmsg.With("could not create listener")) } }@@ -52,15 +52,15 @@ } fds, err := strconv.ParseUint(lfds, 10, 32) if err != nil { - return nil, errors.Wrap(err, "could not parse LISTEN_FDS") + return nil, fault.Wrap(err, fmsg.With("could not parse LISTEN_FDS")) } if i >= fds { - return nil, errors.Errorf("only %d fds available, requested index %d", fds, i) + return nil, fault.Newf("only %d fds available, requested index %d", fds, i) } l, err := net.FileListener(os.NewFile(uintptr(i+fdStart), "")) if err != nil { - return nil, errors.Wrap(err, "could not create listener") + return nil, fault.Wrap(err, fmsg.With("could not create listener")) } return l, nil