Add AXFR test

Test shouldTransfer by upping a testserver and sending the SOA query.

Remove state from DefaultErrorHandler and just get it from the request.

Add more logging to show what is going on.



This also adds the infrastructure for future tests.

1 files changed, 6 insertions, 6 deletions

diff --git a/server/server.go b/server/server.go
index 6f821d62d..67cc35ba5 100644
--- a/server/server.go
+++ b/server/server.go
@@ -16,12 +16,11 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
-
-	"github.com/miekg/coredns/middleware"
 	"github.com/miekg/coredns/middleware/chaos"
 	"github.com/miekg/coredns/middleware/prometheus"
+
 	"github.com/miekg/dns"
+	"golang.org/x/net/context"
 )
 
 // Server represents an instance of a server, which serves
@@ -332,17 +331,18 @@ func (s *Server) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
 // DefaultErrorFunc responds to an HTTP request with a simple description
 // of the specified HTTP status code.
 func DefaultErrorFunc(w dns.ResponseWriter, r *dns.Msg, rcode int) {
+	qtype := dns.Type(r.Question[0].Qtype).String()
+
 	// this code is duplicated a few times, TODO(miek)
 	rc := dns.RcodeToString[rcode]
 	if rc == "" {
 		rc = "RCODE" + strconv.Itoa(rcode)
 	}
+
 	answer := new(dns.Msg)
 	answer.SetRcode(r, rcode)
-
-	state := middleware.State{W: w, Req: r}
 	// Default zone to dropped (without closing dot, so no zone) here to not blow up this metric.
-	metrics.Report(dropped, state.Type(), rc, answer.Len(), time.Now())
+	metrics.Report(dropped, qtype, rc, answer.Len(), time.Now())
 
 	w.WriteMsg(answer)
 }