# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1467929327 -3600
# Node ID 3b7de72e58a9d3b27c8ac9f8aae84bec15273d7a
# Parent  3b6e7ce9431fc42098c80abc849c9d109bc03017
net.http: Add log messages for requests, including their id (so "calling callback" and tracebacks can be traced back to their initial request)

diff -r 3b6e7ce9431f -r 3b7de72e58a9 net/http.lua
--- a/net/http.lua	Thu Jul 07 23:07:19 2016 +0100
+++ b/net/http.lua	Thu Jul 07 23:08:47 2016 +0100
@@ -115,6 +115,13 @@
 end
 
 local function handleerr(err) log("error", "Traceback[http]: %s", traceback(tostring(err), 2)); end
+local function log_if_failed(id, ret, ...)
+	if not ret then
+		log("error", "Request %s: error in callback: %s", id, tostring((...)));
+	end
+	return ...;
+end
+
 local function request(u, ex, callback)
 	local req = url.parse(u);
 
@@ -165,6 +172,8 @@
 		end
 	end
 
+	log("debug", "Making %s %s request %s to %s", req.scheme, method or "GET", req.id, (ex and ex.suppress_url and host_header) or u);
+
 	-- Attach to request object
 	req.method, req.headers, req.body = method, headers, body;
 
@@ -187,7 +196,10 @@
 	req.handler, req.conn = handler, conn
 	req.write = function (...) return req.handler:write(...); end
 
-	req.callback = function (content, code, request, response) log("debug", "Calling callback, status %s", code or "---"); return select(2, xpcall(function () return callback(content, code, request, response) end, handleerr)); end
+	req.callback = function (content, code, request, response)
+		log("debug", "request %s: Calling callback, status %s", req.id, code or "---");
+		return log_if_failed(req.id, xpcall(function () return callback(content, code, request, response) end, handleerr));
+	end
 	req.reader = request_reader;
 	req.state = "status";