Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-01 02:33:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix lookup test (#206)

Browse Source 
* Always continue

* debug queries: more sane impl

This PR just add a msg.Service to debug instead of crafting an TXT RR
at that point. This way we lift on the normal way of generating debug
responses and don't muck with that implementation.

The tags=etcd is flaky as hell for some reason.
This commit is contained in:
Miek Gieben
2016-08-08 21:42:39 -07:00
committed by GitHub
parent b53661d223
commit 3b7b9b49d5
4 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
middleware/etcd/lookup.go
View File

@@ -1,7 +1,6 @@
package etcd
import (
"errors"
"fmt"
"math"
"net"
@@ -74,11 +73,9 @@ func (e Etcd) A(zone string, state middleware.State, previousRecords []dns.RR, o
}
m1, e1 := e.Proxy.Lookup(state, target, state.QType())
if e1 != nil {
if opt.Debug != "" {
debugTxt := errorToTxt(errors.New(target + " IN " + state.Type() + ":" + e1.Error()))
records = append(records, debugTxt)
continue
}
debugMsg := msg.Service{Key: msg.Path(target, e.PathPrefix), Host: target, Text: " IN " + state.Type() + ": " + e1.Error()}
debug = append(debug, debugMsg)
continue
}
// Len(m1.Answer) > 0 here is well?
records = append(records, newRecord)
@@ -138,8 +135,8 @@ func (e Etcd) AAAA(zone string, state middleware.State, previousRecords []dns.RR
}
m1, e1 := e.Proxy.Lookup(state, target, state.QType())
if e1 != nil {
debugTxt := errorToTxt(errors.New(target + " IN " + state.Type() + ": " + e1.Error()))
records = append(records, debugTxt)
debugMsg := msg.Service{Key: msg.Path(target, e.PathPrefix), Host: target, Text: " IN " + state.Type() + ": " + e1.Error()}
debug = append(debug, debugMsg)
continue
}
// Len(m1.Answer) > 0 here is well?
@@ -203,8 +200,8 @@ func (e Etcd) SRV(zone string, state middleware.State, opt Options) (records, ex
if e1 == nil {
extra = append(extra, m1.Answer...)
} else {
debugTxt := errorToTxt(errors.New(srv.Target + " IN A: " + e1.Error()))
extra = append(extra, debugTxt)
debugMsg := msg.Service{Key: msg.Path(srv.Target, e.PathPrefix), Host: srv.Target, Text: " IN A: " + e1.Error()}
debug = append(debug, debugMsg)
}
m1, e1 = e.Proxy.Lookup(state, srv.Target, dns.TypeAAAA)
@@ -216,8 +213,8 @@ func (e Etcd) SRV(zone string, state middleware.State, opt Options) (records, ex
}
}
} else {
debugTxt := errorToTxt(errors.New(srv.Target + " IN AAAA: " + e1.Error()))
extra = append(extra, debugTxt)
debugMsg := msg.Service{Key: msg.Path(srv.Target, e.PathPrefix), Host: srv.Target, Text: " IN AAAA: " + e1.Error()}
debug = append(debug, debugMsg)
}
break
}
@@ -276,8 +273,8 @@ func (e Etcd) MX(zone string, state middleware.State, opt Options) (records, ext
if e1 == nil {
extra = append(extra, m1.Answer...)
} else {
debugTxt := errorToTxt(errors.New(mx.Mx + " IN A: " + e1.Error()))
extra = append(extra, debugTxt)
debugMsg := msg.Service{Key: msg.Path(mx.Mx, e.PathPrefix), Host: mx.Mx, Text: " IN A: " + e1.Error()}
debug = append(debug, debugMsg)
}
m1, e1 = e.Proxy.Lookup(state, mx.Mx, dns.TypeAAAA)
if e1 == nil {
@@ -288,8 +285,8 @@ func (e Etcd) MX(zone string, state middleware.State, opt Options) (records, ext
}
}
} else {
debugTxt := errorToTxt(errors.New(mx.Mx + " IN AAAA: " + e1.Error()))
extra = append(extra, debugTxt)
debugMsg := msg.Service{Key: msg.Path(mx.Mx, e.PathPrefix), Host: mx.Mx, Text: " IN AAAA: " + e1.Error()}
debug = append(debug, debugMsg)
}
break
}