From 986725b46610923ee9db91ac02473fb14fb2dbb6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 5 Jun 2022 20:55:47 +0200 Subject: [PATCH] daemon: improve some errors use pkg/errors for all errors in this file, and wrap some errors to provide context. Signed-off-by: Sebastiaan van Stijn --- cmd/dockerd/daemon_unix.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cmd/dockerd/daemon_unix.go b/cmd/dockerd/daemon_unix.go index 3072678b61..9869043a7f 100644 --- a/cmd/dockerd/daemon_unix.go +++ b/cmd/dockerd/daemon_unix.go @@ -5,7 +5,6 @@ package main import ( "context" - "fmt" "net" "os" "os/signal" @@ -51,7 +50,7 @@ func setDefaultUmask() error { desiredUmask := 0022 unix.Umask(desiredUmask) if umask := unix.Umask(desiredUmask); umask != desiredUmask { - return fmt.Errorf("failed to set umask: expected %#o, got %#o", desiredUmask, umask) + return errors.Errorf("failed to set umask: expected %#o, got %#o", desiredUmask, umask) } return nil @@ -91,25 +90,25 @@ func (cli *DaemonCli) getSwarmRunRoot() string { func allocateDaemonPort(addr string) error { host, port, err := net.SplitHostPort(addr) if err != nil { - return err + return errors.Wrap(err, "error parsing tcp address") } intPort, err := strconv.Atoi(port) if err != nil { - return err + return errors.Wrap(err, "error parsing tcp address") } var hostIPs []net.IP if parsedIP := net.ParseIP(host); parsedIP != nil { hostIPs = append(hostIPs, parsedIP) } else if hostIPs, err = net.LookupIP(host); err != nil { - return fmt.Errorf("failed to lookup %s address in host specification", host) + return errors.Errorf("failed to lookup %s address in host specification", host) } pa := portallocator.Get() for _, hostIP := range hostIPs { if _, err := pa.RequestPort(hostIP, "tcp", intPort); err != nil { - return fmt.Errorf("failed to allocate daemon listening port %d (err: %v)", intPort, err) + return errors.Errorf("failed to allocate daemon listening port %d (err: %v)", intPort, err) } } return nil