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

Support logging to dnstap in forward plugin (#2703)

Browse source
This commit is contained in:
peiranliushop 2019-03-23 05:45:21 -04:00 • committed by Miek Gieben
parent 0e137b23f1
commit 403d42ce20
4 changed files with 128 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugin/forward/forward.go
View file

@ -74,7 +74,7 @@ func (f *Forward) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg
i := 0
list := f.List()
deadline := time.Now().Add(defaultTimeout)
start := time.Now()
for time.Now().Before(deadline) {
if i >= len(list) {
// reached the end of list, reset to begin
@ -126,6 +126,7 @@ func (f *Forward) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg
if child != nil {
child.Finish()
}
taperr := toDnstap(ctx, proxy.addr, f, state, ret, start)
upstreamErr = err
@ -147,11 +148,11 @@ func (f *Forward) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg
formerr := state.ErrorMessage(dns.RcodeFormatError)
w.WriteMsg(formerr)
return 0, nil
return 0, taperr
}
w.WriteMsg(ret)
return 0, nil
return 0, taperr
}
if upstreamErr != nil {