From 6a83168157be08dfce163413cc0733152351048f Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 2 Jul 2018 15:24:15 -0400 Subject: [PATCH] Update ttrpc to 94dde388801693c54f88a6596f713b51a8 Signed-off-by: Michael Crosby --- cmd/containerd-shim/main_unix.go | 2 +- vendor.conf | 2 +- vendor/github.com/containerd/ttrpc/server.go | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go index d0cc0ad71..13413c7fc 100644 --- a/cmd/containerd-shim/main_unix.go +++ b/cmd/containerd-shim/main_unix.go @@ -172,7 +172,7 @@ func serve(server *ttrpc.Server, path string) error { logrus.WithField("socket", path).Debug("serving api on unix socket") go func() { defer l.Close() - if err := server.Serve(l); err != nil && + if err := server.Serve(context.Background(), l); err != nil && !strings.Contains(err.Error(), "use of closed network connection") { logrus.WithError(err).Fatal("containerd-shim: ttrpc server failure") } diff --git a/vendor.conf b/vendor.conf index 835f88a68..218b61cba 100644 --- a/vendor.conf +++ b/vendor.conf @@ -37,7 +37,7 @@ github.com/Microsoft/hcsshim v0.6.11 github.com/boltdb/bolt e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944 golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4 -github.com/containerd/ttrpc fa6c68143601db58b3636ee9948aad2fe08ed1ea +github.com/containerd/ttrpc 94dde388801693c54f88a6596f713b51a8b30b2d github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16 gotest.tools v2.1.0 github.com/google/go-cmp v0.1.0 diff --git a/vendor/github.com/containerd/ttrpc/server.go b/vendor/github.com/containerd/ttrpc/server.go index 3797a09f8..1a518b1b4 100644 --- a/vendor/github.com/containerd/ttrpc/server.go +++ b/vendor/github.com/containerd/ttrpc/server.go @@ -67,12 +67,11 @@ func (s *Server) Register(name string, methods map[string]Method) { s.services.register(name, methods) } -func (s *Server) Serve(l net.Listener) error { +func (s *Server) Serve(ctx context.Context, l net.Listener) error { s.addListener(l) defer s.closeListener(l) var ( - ctx = context.Background() backoff time.Duration handshaker = s.config.handshaker )