p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

return when error happens on listener close

Browse Source 
Signed-off-by: Harry Zhang <harryz@hyper.sh>
Upstream-commit: 390fe752a2883f6f3c3edf66cf2a61862e3e7b2e
Component: engine
This commit is contained in:
Harry Zhang
2016-10-25 14:02:28 +08:00
parent 19febb4ca7
commit 0e37fcada2
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/pkg/listeners/listeners_unix.go
View File

@ -8,7 +8,6 @@ import (
"net"
"strconv"
"github.com/Sirupsen/logrus"
"github.com/coreos/go-systemd/activation"
"github.com/docker/go-connections/sockets"
)
@ -86,8 +85,7 @@ func listenFD(addr string, tlsConfig *tls.Config) ([]net.Listener, error) {
continue
}
if err := ls.Close(); err != nil {
// TODO: We shouldn't log inside a library. Remove this or error out.
logrus.Errorf("failed to close systemd activated file: fd %d: %v", fdOffset+3, err)
return nil, fmt.Errorf("failed to close systemd activated file: fd %d: %v", fdOffset+3, err)
}
}
return []net.Listener{listeners[fdOffset]}, nil