all repos — x @ 3240773ed6892db2916dec8c17e34ee35b42e0b1

Experiments and stuff

switch error package to fault

Alan Pearce
commit

3240773ed6892db2916dec8c17e34ee35b42e0b1

parent

5532e66009d46c50d3d1bd666bf41560228765f8

1 file changed, 6 insertions(+), 6 deletions(-)

changed files
M listenfd/listenfd.golistenfd/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