Changeset

2965:557c976735e1

mod_http_logging: Factor out logging into a function for future reuse
author Kim Alvefur <zash@zash.se>
date Fri, 30 Mar 2018 13:34:15 +0200
parents 2964:1c336d0d0214
children 2966:678be8ea4d38
files mod_http_logging/mod_http_logging.lua
diffstat 1 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mod_http_logging/mod_http_logging.lua	Thu Mar 29 22:07:18 2018 +0200
+++ b/mod_http_logging/mod_http_logging.lua	Fri Mar 30 13:34:15 2018 +0200
@@ -14,16 +14,20 @@
 
 local server = require "net.http.server";
 
+local function log_response(response, body)
+	body = body or response.body;
+	local len = response.headers.content_length or (body and #body) or "-";
+	local request = response.request;
+	local ip = request.conn:ip();
+	local req = string.format("%s %s HTTP/%s", request.method, request.path, request.httpversion);
+	local date = os.date("%d/%m/%Y:%H:%M:%S %z");
+	module:log("info", "%s - - [%s] \"%s\" %d %s", ip, date, req, response.status_code, tostring(len));
+end
+
 local send_response = server.send_response;
 local function log_and_send_response(response, body)
 	if not response.finished then
-		body = body or response.body;
-		local len = body and #body or "-";
-		local request = response.request;
-		local ip = request.conn:ip();
-		local req = string.format("%s %s HTTP/%s", request.method, request.path, request.httpversion);
-		local date = os.date("%d/%m/%Y:%H:%M:%S %z");
-		module:log("info", "%s - - [%s] \"%s\" %d %s", ip, date, req, response.status_code, tostring(len));
+		log_response(response, body);
 	end
 	return send_response(response, body);
 end