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

shim: we use ttrpc in the shim now

Browse Source 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day 2017-11-29 20:50:54 -08:00
parent 96ca9738ca
commit 6c416fa3a7
No known key found for this signature in database
GPG Key ID: 67B3DED84EDC823F
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/containerd-shim/main_unix.go
View File

@ -103,7 +103,7 @@ func executeShim() error {
if err != nil { if err != nil {
return err return err
} }
logrus.Debug("registering grpc server") logrus.Debug("registering ttrpc server")
shimapi.RegisterShimService(server, sv) shimapi.RegisterShimService(server, sv)
socket := socketFlag socket := socketFlag
@ -123,7 +123,7 @@ func executeShim() error {
return handleSignals(logger, signals, server, sv) 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 // this function does not block
func serve(server *ttrpc.Server, path string) error { func serve(server *ttrpc.Server, path string) error {
var ( var (
@ -144,7 +144,7 @@ func serve(server *ttrpc.Server, path string) error {
defer l.Close() defer l.Close()
if err := server.Serve(l); err != nil && if err := server.Serve(l); err != nil &&
!strings.Contains(err.Error(), "use of closed network connection") { !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 return nil