Commit 9bac0a4c authored by Johnny Bergström's avatar Johnny Bergström

Update deprecated grpc dial timeout

The docs say: use DialContext instead.
parent 98e5006e
...@@ -307,7 +307,6 @@ func (h *Client) PingTiller() error { ...@@ -307,7 +307,6 @@ func (h *Client) PingTiller() error {
// are constructed here. // are constructed here.
func (h *Client) connect(ctx context.Context) (conn *grpc.ClientConn, err error) { func (h *Client) connect(ctx context.Context) (conn *grpc.ClientConn, err error) {
opts := []grpc.DialOption{ opts := []grpc.DialOption{
grpc.WithTimeout(5 * time.Second),
grpc.WithBlock(), grpc.WithBlock(),
grpc.WithKeepaliveParams(keepalive.ClientParameters{ grpc.WithKeepaliveParams(keepalive.ClientParameters{
// Send keepalive every 30 seconds to prevent the connection from // Send keepalive every 30 seconds to prevent the connection from
...@@ -322,7 +321,9 @@ func (h *Client) connect(ctx context.Context) (conn *grpc.ClientConn, err error) ...@@ -322,7 +321,9 @@ func (h *Client) connect(ctx context.Context) (conn *grpc.ClientConn, err error)
default: default:
opts = append(opts, grpc.WithInsecure()) opts = append(opts, grpc.WithInsecure())
} }
if conn, err = grpc.Dial(h.opts.host, opts...); err != nil { ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel()
if conn, err = grpc.DialContext(ctx, h.opts.host, opts...); err != nil {
return nil, err return nil, err
} }
return conn, nil return conn, nil
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment