Merge pull request #587 from stevvooe/content-service-module

cmd/containerd: set correct module on interceptor for content
This commit is contained in:
Michael Crosby 2017-02-28 16:50:58 -08:00 committed by GitHub
commit 20a1222aa9
1 changed files with 4 additions and 1 deletions

View File

@ -16,6 +16,7 @@ import (
"github.com/Sirupsen/logrus"
"github.com/docker/containerd"
contentapi "github.com/docker/containerd/api/services/content"
api "github.com/docker/containerd/api/services/execution"
"github.com/docker/containerd/content"
"github.com/docker/containerd/log"
@ -306,7 +307,9 @@ func interceptor(ctx gocontext.Context,
ctx = log.WithModule(ctx, "containerd")
switch info.Server.(type) {
case api.ContainerServiceServer:
ctx = log.WithModule(global, "execution")
ctx = log.WithModule(ctx, "execution")
case contentapi.ContentServer:
ctx = log.WithModule(ctx, "content")
default:
fmt.Printf("unknown GRPC server type: %#v\n", info.Server)
}