Merge pull request #361 from bergwolf/yamux

update grpc-go dependency

Gopkg.toml

@@ -40,7 +40,7 @@
 
 [[constraint]]
   name = "google.golang.org/grpc"
-  revision = "5a9f7b402fe85096d2e1d0383435ee1876e863d0"
+  revision = "d11072e7ca9811b1100b80ca0269ac831f06d024"
 
 [prune]
   non-go = true

grpc.go

@@ -30,7 +30,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 	"golang.org/x/sys/unix"
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	grpcStatus "google.golang.org/grpc/status"
 )
@@ -756,7 +755,7 @@ func (a *agentGRPC) SignalProcess(ctx context.Context, req *pb.SignalProcessRequ
 
 	proc, err := ctr.getProcess(req.ExecId)
 	if err != nil {
-		return emptyResp, grpcStatus.Errorf(grpc.Code(err), "Could not signal process: %v", err)
+		return emptyResp, grpcStatus.Errorf(grpcStatus.Convert(err).Code(), "Could not signal process: %v", err)
 	}
 
 	if err := proc.process.Signal(signal); err != nil {

protocols/client/client.go

@@ -217,6 +217,10 @@ func agentDialer(addr *url.URL, enableYamux bool) dialer {
 }
 
 func unixDialer(sock string, timeout time.Duration) (net.Conn, error) {
+	if strings.HasPrefix(sock, "unix:") {
+		sock = strings.Trim(sock, "unix:")
+	}
+
 	dialFunc := func() (net.Conn, error) {
 		return net.DialTimeout("unix", sock, timeout)
 	}
@@ -285,6 +289,9 @@ func commonDialer(timeout time.Duration, dialFunc func() (net.Conn, error), time
 		if !ok {
 			return nil, timeoutErrMsg
 		}
+	case <-t.C:
+		cancel <- true
+		return nil, timeoutErrMsg
 	}
 
 	return conn, nil