sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upstream: use context to set connectToUpstream timeout

Browse Source 
This allows the timeout to apply to the whole sequence of
operations, as opposed to just Dial.
This commit is contained in:
Simon Ser 2022-04-14 19:42:02 +02:00
parent b790db1423
commit 2ba13fdefc
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
upstream.go
View File

@ -150,7 +150,10 @@ type upstreamConn struct {
func connectToUpstream(ctx context.Context, network *network) (*upstreamConn, error) { func connectToUpstream(ctx context.Context, network *network) (*upstreamConn, error) {
logger := &prefixLogger{network.user.logger, fmt.Sprintf("upstream %q: ", network.GetName())} logger := &prefixLogger{network.user.logger, fmt.Sprintf("upstream %q: ", network.GetName())}
dialer := net.Dialer{Timeout: connectTimeout} ctx, cancel := context.WithTimeout(ctx, connectTimeout)
defer cancel()
var dialer net.Dialer
u, err := network.URL() u, err := network.URL()
if err != nil { if err != nil {