github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5958 from zouyee/dail

Browse Source 
replace deprecated Dialer with ContextDialer
This commit is contained in:
Phil Estes 2021-09-08 09:28:18 -04:00 committed by GitHub
commit bef14adfd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/v2/shim/util_unix.go
View File

@ -77,7 +77,9 @@ func SocketAddress(ctx context.Context, socketPath, id string) (string, error) {
// AnonDialer returns a dialer for a socket
func AnonDialer(address string, timeout time.Duration) (net.Conn, error) {
return dialer.Dialer(socket(address).path(), timeout)
ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()
return dialer.ContextDialer(ctx, socket(address).path())
}
// AnonReconnectDialer returns a dialer for an existing socket on reconnection