From dd537b163ddf63eae428da346e4fa12c2266c0e7 Mon Sep 17 00:00:00 2001
From: Miek Gieben <miek@miek.nl>
Date: Sun, 3 Apr 2016 17:05:16 +0100
Subject: [PATCH] Document log replacements

Rename latency to duration.
---
 middleware/log/README.md | 21 ++++++++++++++++++++-
 middleware/replacer.go   |  5 ++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/middleware/log/README.md b/middleware/log/README.md
index ca601d3ef..2e5cd6d41 100644
--- a/middleware/log/README.md
+++ b/middleware/log/README.md
@@ -33,7 +33,26 @@ CoreDNS will create it before appending to it.
 
 ## Log Format
 
-You can specify a custom log format with any placeholder values. Log supports both request and response placeholders.
+You can specify a custom log format with any placeholder values. Log supports both request and
+response placeholders.
+
+The following place holders are supported:
+
+* `{type}`: qtype of the request.
+* `{name}`: qname of the request.
+* `{class}`: class of the request.
+* `{proto}`: protocol used (tcp or udp).
+* `{when}`: time of the query.
+* `{remote}`: client's IP address.
+* `{port}`: client's port.
+* `{rcode}`: response RCODE.
+* `{size}`: response size.
+* `{duration}`: response duration (in seconds).
+* `{>bufsize}`: the EDNS0 buffer size advertized by the client.
+* `{>do}`: is the EDNS0 DO (DNSSEC OK) bit set.
+* `{>id}`: query ID
+* `{>opcode}`: query OPCODE
+
 
 ## Log Rotation
 
diff --git a/middleware/replacer.go b/middleware/replacer.go
index 9d242fdb9..6a5d48b27 100644
--- a/middleware/replacer.go
+++ b/middleware/replacer.go
@@ -1,6 +1,7 @@
 package middleware
 
 import (
+	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -54,13 +55,15 @@ func NewReplacer(r *dns.Msg, rr *ResponseRecorder, emptyValue string) Replacer {
 		}
 		rep.replacements["{rcode}"] = rcode
 		rep.replacements["{size}"] = strconv.Itoa(rr.size)
-		rep.replacements["{latency}"] = time.Since(rr.start).String()
+		rep.replacements["{duration}"] = time.Since(rr.start).String()
 	}
 
 	// Header placeholders (case-insensitive)
 	// TODO(miek): syntax for flags and document it
 	rep.replacements[headerReplacer+"id}"] = strconv.Itoa(int(r.Id))
 	rep.replacements[headerReplacer+"opcode}"] = strconv.Itoa(int(r.Opcode))
+	rep.replacements[headerReplacer+"do}"] = fmt.Sprintf("%b", state.Do())
+	rep.replacements[headerReplacer+"bufsize}"] = strconv.Itoa(state.Size())
 
 	return rep
 }