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

Merge pull request #826 from mlaventure/fix-healtcheck-warning

Browse Source 
Don't print a warning when getting a healtcheck request
This commit is contained in:
Michael Crosby 2017-05-09 15:49:45 -07:00 committed by GitHub
commit 5e192fae6c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/containerd/main.go
View File

@ -14,6 +14,7 @@ import (
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
gocontext "golang.org/x/net/context" gocontext "golang.org/x/net/context"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/health/grpc_health_v1"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/containerd/containerd" "github.com/containerd/containerd"
@ -419,8 +420,10 @@ func interceptor(ctx gocontext.Context,
ctx = log.WithModule(ctx, "rootfs") ctx = log.WithModule(ctx, "rootfs")
case imagesapi.ImagesServer: case imagesapi.ImagesServer:
ctx = log.WithModule(ctx, "images") ctx = log.WithModule(ctx, "images")
case grpc_health_v1.HealthServer:
// No need to change the context
default: default:
fmt.Printf("unknown GRPC server type: %#v\n", info.Server) log.G(ctx).Warnf("unknown GRPC server type: %#v\n", info.Server)
} }
return grpc_prometheus.UnaryServerInterceptor(ctx, req, info, handler) return grpc_prometheus.UnaryServerInterceptor(ctx, req, info, handler)
} }