From 6c416fa3a7c9abf35e1dbc8069bd680203ce759e Mon Sep 17 00:00:00 2001 From: Stephen J Day Date: Wed, 29 Nov 2017 20:50:54 -0800 Subject: [PATCH] shim: we use ttrpc in the shim now Signed-off-by: Stephen J Day --- cmd/containerd-shim/main_unix.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go index f26c15007..c8df7a5a4 100644 --- a/cmd/containerd-shim/main_unix.go +++ b/cmd/containerd-shim/main_unix.go @@ -103,7 +103,7 @@ func executeShim() error { if err != nil { return err } - logrus.Debug("registering grpc server") + logrus.Debug("registering ttrpc server") shimapi.RegisterShimService(server, sv) socket := socketFlag @@ -123,7 +123,7 @@ func executeShim() error { return handleSignals(logger, signals, server, sv) } -// serve serves the grpc API over a unix socket at the provided path +// serve serves the ttrpc API over a unix socket at the provided path // this function does not block func serve(server *ttrpc.Server, path string) error { var ( @@ -144,7 +144,7 @@ func serve(server *ttrpc.Server, path string) error { defer l.Close() if err := server.Serve(l); err != nil && !strings.Contains(err.Error(), "use of closed network connection") { - logrus.WithError(err).Fatal("containerd-shim: GRPC server failure") + logrus.WithError(err).Fatal("containerd-shim: ttrpc server failure") } }() return nil