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

Merge pull request #3192 from thaJeztah/bump_grpc_1.19.1

Browse Source 
bump google.golang.org/grpc v1.20.1
This commit is contained in:
Derek McGowan
2019-05-22 11:58:52 -07:00
committed by GitHub
parent c9c555cd71 2ed8e60fa1
commit 25daa7355c
98 changed files with 8186 additions and 5304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/containerd/command/publish.go
View File

@@ -84,18 +84,18 @@ func getEventPayload(r io.Reader) (*types.Any, error) {
}
func connectEvents(address string) (eventsapi.EventsClient, error) {
conn, err := connect(address, dialer.Dialer)
conn, err := connect(address, dialer.ContextDialer)
if err != nil {
return nil, errors.Wrapf(err, "failed to dial %q", address)
}
return eventsapi.NewEventsClient(conn), nil
}
func connect(address string, d func(string, time.Duration) (net.Conn, error)) (*grpc.ClientConn, error) {
func connect(address string, d func(gocontext.Context, string) (net.Conn, error)) (*grpc.ClientConn, error) {
gopts := []grpc.DialOption{
grpc.WithBlock(),
grpc.WithInsecure(),
grpc.WithDialer(d),
grpc.WithContextDialer(d),
grpc.FailOnNonTempDialError(true),
grpc.WithBackoffMaxDelay(3 * time.Second),
}