fix application bug

vendor/github.com/docker/go-connections/sockets/unix_socket.go

@@ -1,51 +1,5 @@
 // +build !windows
 
-/*
-Package sockets is a simple unix domain socket wrapper.
-
-Usage
-
-For example:
-
-	import(
-		"fmt"
-		"net"
-		"os"
-		"github.com/docker/go-connections/sockets"
-	)
-
-	func main() {
-		l, err := sockets.NewUnixSocketWithOpts("/path/to/sockets",
-			sockets.WithChown(0,0),sockets.WithChmod(0660))
-		if err != nil {
-			panic(err)
-		}
-		echoStr := "hello"
-
-		go func() {
-			for {
-				conn, err := l.Accept()
-				if err != nil {
-					return
-				}
-				conn.Write([]byte(echoStr))
-				conn.Close()
-			}
-		}()
-
-		conn, err := net.Dial("unix", path)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		buf := make([]byte, 5)
-		if _, err := conn.Read(buf); err != nil {
-			panic(err)
-		} else if string(buf) != echoStr {
-			panic(fmt.Errorf("Msg may lost"))
-		}
-	}
-*/
 package sockets
 
 import (
@@ -54,31 +8,8 @@ import (
 	"syscall"
 )
 
-// SockOption sets up socket file's creating option
-type SockOption func(string) error
-
-// WithChown modifies the socket file's uid and gid
-func WithChown(uid, gid int) SockOption {
-	return func(path string) error {
-		if err := os.Chown(path, uid, gid); err != nil {
-			return err
-		}
-		return nil
-	}
-}
-
-// WithChmod modifies socket file's access mode
-func WithChmod(mask os.FileMode) SockOption {
-	return func(path string) error {
-		if err := os.Chmod(path, mask); err != nil {
-			return err
-		}
-		return nil
-	}
-}
-
-// NewUnixSocketWithOpts creates a unix socket with the specified options
-func NewUnixSocketWithOpts(path string, opts ...SockOption) (net.Listener, error) {
+// NewUnixSocket creates a unix socket with the specified path and group.
+func NewUnixSocket(path string, gid int) (net.Listener, error) {
 	if err := syscall.Unlink(path); err != nil && !os.IsNotExist(err) {
 		return nil, err
 	}
@@ -89,18 +20,13 @@ func NewUnixSocketWithOpts(path string, opts ...SockOption) (net.Listener, error
 	if err != nil {
 		return nil, err
 	}
-
-	for _, op := range opts {
-		if err := op(path); err != nil {
-			l.Close()
-			return nil, err
-		}
+	if err := os.Chown(path, 0, gid); err != nil {
+		l.Close()
+		return nil, err
+	}
+	if err := os.Chmod(path, 0660); err != nil {
+		l.Close()
+		return nil, err
 	}
-
 	return l, nil
 }
-
-// NewUnixSocket creates a unix socket with the specified path and group.
-func NewUnixSocket(path string, gid int) (net.Listener, error) {
-	return NewUnixSocketWithOpts(path, WithChown(0, gid), WithChmod(0660))
-}

vendor/github.com/docker/go-units/duration.go

@@ -18,7 +18,7 @@ func HumanDuration(d time.Duration) string {
 		return fmt.Sprintf("%d seconds", seconds)
 	} else if minutes := int(d.Minutes()); minutes == 1 {
 		return "About a minute"
-	} else if minutes < 46 {
+	} else if minutes < 60 {
 		return fmt.Sprintf("%d minutes", minutes)
 	} else if hours := int(d.Hours() + 0.5); hours == 1 {
 		return "About an hour"

vendor/github.com/docker/go-units/ulimit.go

@@ -96,8 +96,13 @@ func ParseUlimit(val string) (*Ulimit, error) {
 		return nil, fmt.Errorf("too many limit value arguments - %s, can only have up to two, `soft[:hard]`", parts[1])
 	}
 
-	if soft > *hard {
-		return nil, fmt.Errorf("ulimit soft limit must be less than or equal to hard limit: %d > %d", soft, *hard)
+	if *hard != -1 {
+		if soft == -1 {
+			return nil, fmt.Errorf("ulimit soft limit must be less than or equal to hard limit: soft: -1 (unlimited), hard: %d", *hard)
+		}
+		if soft > *hard {
+			return nil, fmt.Errorf("ulimit soft limit must be less than or equal to hard limit: %d > %d", soft, *hard)
+		}
 	}
 
 	return &Ulimit{Name: parts[0], Soft: soft, Hard: *hard}, nil