aboutsummaryrefslogtreecommitdiff
path: root/middleware/kubernetes/handler.go
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2016-12-20 18:58:05 +0000
committerGravatar GitHub <noreply@github.com> 2016-12-20 18:58:05 +0000
commitc4ab98c6e336a1c39b3934bbb3bf691f849a6dbe (patch)
tree89d801ac1484232179bcb7c144f67b5945221367 /middleware/kubernetes/handler.go
parent451a0bd5294f6c8a6c9c725c75ac1a9cbc996a42 (diff)
downloadcoredns-c4ab98c6e336a1c39b3934bbb3bf691f849a6dbe.tar.gz
coredns-c4ab98c6e336a1c39b3934bbb3bf691f849a6dbe.tar.zst
coredns-c4ab98c6e336a1c39b3934bbb3bf691f849a6dbe.zip
Add middleware.NextOrFailure (#462)
This checks if the next middleware to be called is nil, and if so returns ServerFailure and an error. This makes the next calling more robust and saves some lines of code. Also prefix the error with the name of the middleware to aid in debugging.
Diffstat (limited to 'middleware/kubernetes/handler.go')
-rw-r--r--middleware/kubernetes/handler.go9
1 files changed, 3 insertions, 6 deletions
diff --git a/middleware/kubernetes/handler.go b/middleware/kubernetes/handler.go
index e21ea6d58..f35792881 100644
--- a/middleware/kubernetes/handler.go
+++ b/middleware/kubernetes/handler.go
@@ -1,7 +1,7 @@
package kubernetes
import (
- "fmt"
+ "errors"
"github.com/miekg/coredns/middleware"
"github.com/miekg/coredns/middleware/pkg/dnsutil"
@@ -15,7 +15,7 @@ import (
func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
state := request.Request{W: w, Req: r}
if state.QClass() != dns.ClassINET {
- return dns.RcodeServerFailure, fmt.Errorf("can only deal with ClassINET")
+ return dns.RcodeServerFailure, middleware.Error(k.Name(), errors.New("can only deal with ClassINET"))
}
m := new(dns.Msg)
@@ -26,10 +26,7 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M
// otherwise delegate to the next in the pipeline.
zone := middleware.Zones(k.Zones).Matches(state.Name())
if zone == "" {
- if k.Next == nil {
- return dns.RcodeServerFailure, nil
- }
- return k.Next.ServeDNS(ctx, w, r)
+ return middleware.NextOrFailure(k.Name(), k.Next, ctx, w, r)
}
var (