Skip to content

Commit

Permalink
fix #1732
Browse files Browse the repository at this point in the history
Signed-off-by: monkey <golang@88.com>
  • Loading branch information
monkey92t committed Apr 21, 2021
1 parent b7720fd commit 0b855ec
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions sentinel.go
Original file line number Diff line number Diff line change
Expand Up @@ -219,14 +219,21 @@ func masterSlaveDialer(
failover.trySwitchMaster(ctx, addr)
}
}

if err != nil {
return nil, err
}
if failover.opt.Dialer != nil {
return failover.opt.Dialer(ctx, network, addr)
}
return net.DialTimeout("tcp", addr, failover.opt.DialTimeout)

netDialer := &net.Dialer{
Timeout: failover.opt.DialTimeout,
KeepAlive: 5 * time.Minute,
}
if failover.opt.TLSConfig == nil {
return netDialer.DialContext(ctx, network, addr)
}
return tls.DialWithDialer(netDialer, network, addr, failover.opt.TLSConfig)
}
}

Expand Down

0 comments on commit 0b855ec

Please sign in to comment.