Revert "log/forward plugins: Extend dns query logging (#2240)" (#2256)

This reverts commit 8045aa279b.
This commit is contained in:
Miek Gieben
2018-10-31 21:03:46 +00:00
committed by GitHub
parent e332c8d8cb
commit 1ef0a02b46
7 changed files with 5 additions and 55 deletions

View File

@@ -72,10 +72,6 @@ The following place holders are supported:
* `{>do}`: is the EDNS0 DO (DNSSEC OK) bit set in the query
* `{>id}`: query ID
* `{>opcode}`: query OPCODE
* `{local}`: server's IP address, for IPv6 addresses these are enclosed in brackets: `[::1]`
* `{A}`: number of the A type answers in the response
* `{AAAA}`: number of the AAAA type answers in the response
* `{forward/resolving_proxy}`: if the query was forwarded to a resolver, the IP address and port of that replied resolver, else empty. The metadata plugin needs to be enabled to use this placeholder
The default Common Log Format is:

View File

@@ -57,7 +57,7 @@ func (l Logger) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg)
// If we don't set up a class in config, the default "all" will be added
// and we shouldn't have an empty rule.Class.
if rule.Class[response.All] || rule.Class[class] {
rep := replacer.New(ctx, r, rrw, CommonLogEmptyValue)
rep := replacer.New(r, rrw, CommonLogEmptyValue)
rule.Log.Println(rep.Replace(rule.Format))
}