diff options
author | 2016-12-20 18:58:05 +0000 | |
---|---|---|
committer | 2016-12-20 18:58:05 +0000 | |
commit | c4ab98c6e336a1c39b3934bbb3bf691f849a6dbe (patch) | |
tree | 89d801ac1484232179bcb7c144f67b5945221367 /middleware/rewrite/rewrite.go | |
parent | 451a0bd5294f6c8a6c9c725c75ac1a9cbc996a42 (diff) | |
download | coredns-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/rewrite/rewrite.go')
-rw-r--r-- | middleware/rewrite/rewrite.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/middleware/rewrite/rewrite.go b/middleware/rewrite/rewrite.go index ad28287ac..adbdbca15 100644 --- a/middleware/rewrite/rewrite.go +++ b/middleware/rewrite/rewrite.go @@ -37,9 +37,9 @@ func (rw Rewrite) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg switch result := rule.Rewrite(r); result { case RewriteDone: if rw.noRevert { - return rw.Next.ServeDNS(ctx, w, r) + return middleware.NextOrFailure(rw.Name(), rw.Next, ctx, w, r) } - return rw.Next.ServeDNS(ctx, wr, r) + return middleware.NextOrFailure(rw.Name(), rw.Next, ctx, wr, r) case RewriteIgnored: break case RewriteStatus: @@ -49,7 +49,7 @@ func (rw Rewrite) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg // } } } - return rw.Next.ServeDNS(ctx, w, r) + return middleware.NextOrFailure(rw.Name(), rw.Next, ctx, w, r) } // Name implements the Handler interface. |