From fd1def07a888a9bc882efb61d28e23447ead7c38 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 7 Jul 2016 23:08:47 +0100 Subject: [PATCH] net.http: Add log messages for requests, including their id (so "calling callback" and tracebacks can be traced back to their initial request) --- net/http.lua | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/net/http.lua b/net/http.lua index 5fa0c0a9..669fa9a5 100644 --- a/net/http.lua +++ b/net/http.lua @@ -115,6 +115,13 @@ local function request_reader(request, data, err) 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 @@ local function request(u, ex, callback) 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 @@ local function request(u, ex, callback) 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"; -- 2.30.2