kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

daemon/listeners: use pkg/errors

Browse source 
Co-Authored-By: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Kirill Kolyshkin 2019-07-25 08:38:44 -07:00 • committed by Sebastiaan van Stijn
parent f416e99a05
commit 41be7293f5
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
daemon/listeners/listeners_linux.go
View file

@ -2,7 +2,6 @@ package listeners // import "github.com/docker/docker/daemon/listeners"
import ( import (
"crypto/tls" "crypto/tls"
"fmt"
"net" "net"
"os" "os"
"strconv" "strconv"
@ -10,6 +9,7 @@ import (
"github.com/coreos/go-systemd/v22/activation" "github.com/coreos/go-systemd/v22/activation"
"github.com/docker/docker/pkg/homedir" "github.com/docker/docker/pkg/homedir"
"github.com/docker/go-connections/sockets" "github.com/docker/go-connections/sockets"
"github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -44,7 +44,7 @@ func Init(proto, addr, socketGroup string, tlsConfig *tls.Config) ([]net.Listene
} }
l, err := sockets.NewUnixSocket(addr, gid) l, err := sockets.NewUnixSocket(addr, gid)
if err != nil { if err != nil {
return nil, fmt.Errorf("can't create unix socket %s: %v", addr, err) return nil, errors.Wrapf(err, "can't create unix socket %s", addr)
} }
if _, err := homedir.StickRuntimeDirContents([]string{addr}); err != nil { if _, err := homedir.StickRuntimeDirContents([]string{addr}); err != nil {
// StickRuntimeDirContents returns nil error if XDG_RUNTIME_DIR is just unset // StickRuntimeDirContents returns nil error if XDG_RUNTIME_DIR is just unset
@ -52,7 +52,7 @@ func Init(proto, addr, socketGroup string, tlsConfig *tls.Config) ([]net.Listene
} }
ls = append(ls, l) ls = append(ls, l)
default: default:
return nil, fmt.Errorf("invalid protocol format: %q", proto) return nil, errors.Errorf("invalid protocol format: %q", proto)
} }
return ls, nil return ls, nil
@ -76,7 +76,7 @@ func listenFD(addr string, tlsConfig *tls.Config) ([]net.Listener, error) {
} }
if len(listeners) == 0 { if len(listeners) == 0 {
return nil, fmt.Errorf("no sockets found via socket activation: make sure the service was started by systemd") return nil, errors.New("no sockets found via socket activation: make sure the service was started by systemd")
} }
// default to all fds just like unix:// and tcp:// // default to all fds just like unix:// and tcp://
@ -86,21 +86,21 @@ func listenFD(addr string, tlsConfig *tls.Config) ([]net.Listener, error) {
fdNum, err := strconv.Atoi(addr) fdNum, err := strconv.Atoi(addr)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to parse systemd fd address: should be a number: %v", addr) return nil, errors.Errorf("failed to parse systemd fd address: should be a number: %v", addr)
} }
fdOffset := fdNum - 3 fdOffset := fdNum - 3
if len(listeners) < fdOffset+1 { if len(listeners) < fdOffset+1 {
return nil, fmt.Errorf("too few socket activated files passed in by systemd") return nil, errors.New("too few socket activated files passed in by systemd")
} }
if listeners[fdOffset] == nil { if listeners[fdOffset] == nil {
return nil, fmt.Errorf("failed to listen on systemd activated file: fd %d", fdOffset+3) return nil, errors.Errorf("failed to listen on systemd activated file: fd %d", fdOffset+3)
} }
for i, ls := range listeners { for i, ls := range listeners {
if i == fdOffset || ls == nil { if i == fdOffset || ls == nil {
continue continue
} }
if err := ls.Close(); err != nil { if err := ls.Close(); err != nil {
return nil, fmt.Errorf("failed to close systemd activated file: fd %d: %v", fdOffset+3, err) return nil, errors.Wrapf(err, "failed to close systemd activated file: fd %d", fdOffset+3)
} }
} }
return []net.Listener{listeners[fdOffset]}, nil return []net.Listener{listeners[fdOffset]}, nil