Merge pull request moby#27713 from resouer/return-err

LK4D4 · web-flow · commit 40c51569e2a5 · 2017-01-27T12:29:08.000-08:00
return when error happens on listener close
diff --git a/pkg/listeners/listeners_unix.go b/pkg/listeners/listeners_unix.go
@@ -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

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