JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adds context timeout to transport.DialAddress (#1528)

Browse Source
This commit is contained in:
Natalie Villasana 2019-03-20 06:11:07 -04:00 committed by Egon Elbre
parent 724aaab78d
commit b4b99fa979
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/transport/transport.go
View File

@ -67,8 +67,8 @@ func (transport *Transport) DialNode(ctx context.Context, node *pb.Node, opts ..
grpc.FailOnNonTempDialError(true),
}, opts...)
timedCtx, cf := context.WithTimeout(ctx, connWaitTimeout)
defer cf()
timedCtx, cancel := context.WithTimeout(ctx, connWaitTimeout)
defer cancel()
conn, err = grpc.DialContext(timedCtx, node.GetAddress().Address, options...)
if err != nil {
@ -98,7 +98,10 @@ func (transport *Transport) DialAddress(ctx context.Context, address string, opt
grpc.FailOnNonTempDialError(true),
}, opts...)
conn, err = grpc.DialContext(ctx, address, options...)
timedCtx, cancel := context.WithTimeout(ctx, connWaitTimeout)
defer cancel()
conn, err = grpc.DialContext(timedCtx, address, options...)
if err == context.Canceled {
return nil, err
}