Commit bdf71cf2 authored by Miek Gieben's avatar Miek Gieben Committed by GitHub

middleware/proxy: silence gprc errors (#699)

* middleware/proxy: silence gprc errors

Add discard logger

* Silence glog crap

* Revert "Silence glog crap"

This reverts commit a15dafbca62b4e91d4c41543b4c06b8c39a5e500.
parent 7be066e4
...@@ -3,6 +3,8 @@ package proxy ...@@ -3,6 +3,8 @@ package proxy
import ( import (
"testing" "testing"
"time" "time"
"google.golang.org/grpc/grpclog"
) )
func pool() []*UpstreamHost { func pool() []*UpstreamHost {
...@@ -17,6 +19,8 @@ func pool() []*UpstreamHost { ...@@ -17,6 +19,8 @@ func pool() []*UpstreamHost {
} }
func TestStartupShutdown(t *testing.T) { func TestStartupShutdown(t *testing.T) {
grpclog.SetLogger(discard{})
upstream := &staticUpstream{ upstream := &staticUpstream{
from: ".", from: ".",
Hosts: pool(), Hosts: pool(),
...@@ -28,7 +32,7 @@ func TestStartupShutdown(t *testing.T) { ...@@ -28,7 +32,7 @@ func TestStartupShutdown(t *testing.T) {
g := newGrpcClient(nil, upstream) g := newGrpcClient(nil, upstream)
upstream.ex = g upstream.ex = g
p := &Proxy{Trace: nil} p := &Proxy{}
p.Upstreams = &[]Upstream{upstream} p.Upstreams = &[]Upstream{upstream}
err := g.OnStartup(p) err := g.OnStartup(p)
...@@ -52,3 +56,13 @@ func TestStartupShutdown(t *testing.T) { ...@@ -52,3 +56,13 @@ func TestStartupShutdown(t *testing.T) {
t.Errorf("Shutdown didn't remove conns, found %d", len(g.conns)) 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{}) {}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment