From: Marek Vavruša <mvavrusa@cloudflare.com>
Date: Tue, 28 Nov 2017 16:34:23 +0000 (-0800)
Subject: modules/http: updated format of the /trace log
X-Git-Tag: v2.0.0~16^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02809b8ca3c727d98c4e32daf204f1bc1cdefdb4;p=thirdparty%2Fknot-resolver.git

modules/http: updated format of the /trace log
---

diff --git a/modules/http/README.rst b/modules/http/README.rst
index 1fff6cbfc..e9414fc81 100644
--- a/modules/http/README.rst
+++ b/modules/http/README.rst
@@ -116,22 +116,22 @@ The basic mode allows you to resolve a query and trace verbose logs (and message
 
 .. code-block:: bash
 
-   $ curl http://localhost:8080/trace/e.root-servers.net
-   iter | 'e.root-servers.net.' type 'A' created outbound query, parent id 0
-    rc  | => rank: 020, lowest 020, e.root-servers.net. A
-    rc  | => satisfied from cache
-   iter | <= answer received:
-   ;; ->>HEADER<<- opcode: QUERY; status: NOERROR; id: 14771
+   $ curl http://localhost:8053/trace/e.root-servers.net
+   [ 8138] [iter] 'e.root-servers.net.' type 'A' created outbound query, parent id 0
+   [ 8138] [ rc ] => rank: 020, lowest 020, e.root-servers.net. A
+   [ 8138] [ rc ] => satisfied from cache
+   [ 8138] [iter] <= answer received:
+   ;; ->>HEADER<<- opcode: QUERY; status: NOERROR; id: 8138
    ;; Flags: qr aa  QUERY: 1; ANSWER: 0; AUTHORITY: 0; ADDITIONAL: 0
 
    ;; QUESTION SECTION
    e.root-servers.net.		A
 
    ;; ANSWER SECTION
-   e.root-servers.net. 	3599821	A	192.203.230.10
+   e.root-servers.net. 	3556353	A	192.203.230.10
 
-   iter | <= rcode: NOERROR
-   resl | finished: 4, queries: 1, mempool: 81952 B
+   [ 8138] [iter] <= rcode: NOERROR
+   [ 8138] [resl] finished: 4, queries: 1, mempool: 81952 B
 
 How to expose services over HTTP
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/modules/http/http_trace.lua b/modules/http/http_trace.lua
index 46a65f3de..c09973a0f 100644
--- a/modules/http/http_trace.lua
+++ b/modules/http/http_trace.lua
@@ -21,8 +21,9 @@ local function serve_trace(h, _)
 
 	-- Create logging handler callback
 	local buffer = {}
-	local buffer_log_cb = ffi.cast('trace_log_f', function (_, source, msg)
-		local message = string.format('%4s | %s', ffi.string(source), ffi.string(msg))
+	local buffer_log_cb = ffi.cast('trace_log_f', function (query, source, msg)
+		local message = string.format('[%5u] [%s] %s',
+			tonumber(query.id), ffi.string(source), ffi.string(msg))
 		table.insert(buffer, message)
 	end)