diff --git a/middleware/proxy/grpc.go b/middleware/proxy/grpc.go index 031869c60..fb88ef37d 100644 --- a/middleware/proxy/grpc.go +++ b/middleware/proxy/grpc.go @@ -14,8 +14,13 @@ import ( opentracing "github.com/opentracing/opentracing-go" "google.golang.org/grpc" "google.golang.org/grpc/credentials" + "google.golang.org/grpc/grpclog" ) +func init() { + grpclog.SetLogger(discard{}) +} + type grpcClient struct { dialOpts []grpc.DialOption clients map[string]pb.DnsServiceClient @@ -92,3 +97,13 @@ func (g *grpcClient) OnStartup(p *Proxy) error { } return nil } + +// discard is a Logger that outputs nothing. +type discard struct{} + +func (d discard) Fatal(args ...interface{}) {} +func (d discard) Fatalf(format string, args ...interface{}) {} +func (d discard) Fatalln(args ...interface{}) {} +func (d discard) Print(args ...interface{}) {} +func (d discard) Printf(format string, args ...interface{}) {} +func (d discard) Println(args ...interface{}) {} diff --git a/middleware/proxy/grpc_test.go b/middleware/proxy/grpc_test.go index 1a0d406ec..398580455 100644 --- a/middleware/proxy/grpc_test.go +++ b/middleware/proxy/grpc_test.go @@ -3,8 +3,6 @@ package proxy import ( "testing" "time" - - "google.golang.org/grpc/grpclog" ) func pool() []*UpstreamHost { @@ -19,8 +17,6 @@ func pool() []*UpstreamHost { } func TestStartupShutdown(t *testing.T) { - grpclog.SetLogger(discard{}) - upstream := &staticUpstream{ from: ".", Hosts: pool(), @@ -56,13 +52,3 @@ func TestStartupShutdown(t *testing.T) { t.Errorf("Shutdown didn't remove conns, found %d", len(g.conns)) } } - -// discard is a Logger that outputs nothing. -type discard struct{} - -func (d discard) Fatal(args ...interface{}) {} -func (d discard) Fatalf(format string, args ...interface{}) {} -func (d discard) Fatalln(args ...interface{}) {} -func (d discard) Print(args ...interface{}) {} -func (d discard) Printf(format string, args ...interface{}) {} -func (d discard) Println(args ...interface{}) {}