Merge pull request #986 from estesp/non-block-grpc-dist

Don't use WithBlock() on `dist` gRPC connection
This commit is contained in:
Stephen Day 2017-06-09 13:59:32 -07:00 committed by GitHub
commit 7759386675

1
cmd/dist/common.go vendored
View File

@ -102,7 +102,6 @@ func connectGRPC(context *cli.Context) (*grpc.ClientConn, error) {
timeout := context.GlobalDuration("connect-timeout") timeout := context.GlobalDuration("connect-timeout")
return grpc.Dial(address, return grpc.Dial(address,
grpc.WithTimeout(timeout), grpc.WithTimeout(timeout),
grpc.WithBlock(),
grpc.WithInsecure(), grpc.WithInsecure(),
grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) { grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
return net.DialTimeout("unix", address, timeout) return net.DialTimeout("unix", address, timeout)