TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

cleanups: go vet/golint (#331)

Browse source 
Go vet and golint the new code once again.

Drop Name from NameTemplate - it's cleaner: nametemplate.Template.
This commit is contained in:
Miek Gieben 2016-10-12 12:46:35 +01:00 • committed by GitHub
parent 710c9b111f
commit aa7744dc86
16 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

12
middleware/proxy/client.go
View file

@ -10,19 +10,19 @@ import (
"github.com/miekg/dns"
)
type Client struct {
type client struct {
Timeout time.Duration
group *singleflight.Group
}
func NewClient() *Client {
return &Client{Timeout: defaultTimeout, group: new(singleflight.Group)}
func newClient() *client {
return &client{Timeout: defaultTimeout, group: new(singleflight.Group)}
}
// ServeDNS does not satisfy middleware.Handler, instead it interacts with the upstream
// and returns the respons or an error.
func (c *Client) ServeDNS(w dns.ResponseWriter, r *dns.Msg, u *UpstreamHost) (*dns.Msg, error) {
func (c *client) ServeDNS(w dns.ResponseWriter, r *dns.Msg, u *UpstreamHost) (*dns.Msg, error) {
co, err := net.DialTimeout(request.Proto(w), u.Name, c.Timeout)
if err != nil {
return nil, err
@ -47,7 +47,7 @@ func (c *Client) ServeDNS(w dns.ResponseWriter, r *dns.Msg, u *UpstreamHost) (*d
return reply, nil
}
func (c *Client) Exchange(m *dns.Msg, co net.Conn) (*dns.Msg, time.Duration, error) {
func (c *client) Exchange(m *dns.Msg, co net.Conn) (*dns.Msg, time.Duration, error) {
t := "nop"
if t1, ok := dns.TypeToString[m.Question[0].Qtype]; ok {
t = t1
@ -76,7 +76,7 @@ func (c *Client) Exchange(m *dns.Msg, co net.Conn) (*dns.Msg, time.Duration, err
// exchange does *not* return a pointer to dns.Msg because that leads to buffer reuse when
// group.Do is used in Exchange.
func (c *Client) exchange(m *dns.Msg, co net.Conn) (dns.Msg, error) {
func (c *client) exchange(m *dns.Msg, co net.Conn) (dns.Msg, error) {
opt := m.IsEdns0()
udpsize := uint16(dns.MinMsgSize)

2
middleware/proxy/lookup.go
View file

@ -13,7 +13,7 @@ import (
// New create a new proxy with the hosts in host and a Random policy.
func New(hosts []string) Proxy {
p := Proxy{Next: nil, Client: NewClient()}
p := Proxy{Next: nil, Client: newClient()}
upstream := &staticUpstream{
from: "",

2
middleware/proxy/proxy.go
View file

@ -17,7 +17,7 @@ var errUnreachable = errors.New("unreachable backend")
// Proxy represents a middleware instance that can proxy requests to another DNS server.
type Proxy struct {
Next middleware.Handler
Client *Client
Client *client
Upstreams []Upstream
}

2
middleware/proxy/setup.go
View file

@ -20,7 +20,7 @@ func setup(c *caddy.Controller) error {
return middleware.Error("proxy", err)
}
dnsserver.GetConfig(c).AddMiddleware(func(next middleware.Handler) middleware.Handler {
return Proxy{Next: next, Client: NewClient(), Upstreams: upstreams}
return Proxy{Next: next, Client: newClient(), Upstreams: upstreams}
})
return nil