Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-12-07 19:05:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

plugin/forward/grpc: Revert forward/grpc policy dedup (#3919)

Browse Source 
* revert de-dup

Signed-off-by: Chris O'Haver <cohaver@infoblox.com>

* unit test

Signed-off-by: Chris O'Haver <cohaver@infoblox.com>

* use roundrobin policy in test

Signed-off-by: Chris O'Haver <cohaver@infoblox.com>
This commit is contained in:
Chris O'Haver
2020-05-29 12:30:26 -04:00
committed by GitHub
parent bc2ba28865
commit 54fb2112ac
8 changed files with 166 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugin/grpc/grpc.go
View File

@@ -7,7 +7,6 @@ import (
"github.com/coredns/coredns/plugin"
"github.com/coredns/coredns/plugin/debug"
"github.com/coredns/coredns/plugin/pkg/policy"
"github.com/coredns/coredns/request"
"github.com/miekg/dns"
@@ -18,7 +17,7 @@ import (
// It has a list of proxies each representing one upstream proxy.
type GRPC struct {
proxies []*Proxy
p policy.Policy
p Policy
from string
ignored []string
@@ -94,7 +93,7 @@ func (g *GRPC) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (
// NewGRPC returns a new GRPC.
func newGRPC() *GRPC {
g := &GRPC{
p: new(policy.Random),
p: new(random),
}
return g
}
@@ -127,11 +126,6 @@ func (g *GRPC) isAllowedDomain(name string) bool {
}
// List returns a set of proxies to be used for this client depending on the policy in p.
func (g *GRPC) list() []*Proxy {
if len(g.p.List(g.proxies)) == 1 {
return g.p.List(g.proxies)[0].([]*Proxy)
}
return nil
}
func (g *GRPC) list() []*Proxy { return g.p.List(g.proxies) }
const defaultTimeout = 5 * time.Second