Automated merge with http://waqas.ath.cx:8000/

Fri, 29 May 2009 22:06:21 +0100

author
Matthew Wild <mwild1@gmail.com>
date
Fri, 29 May 2009 22:06:21 +0100
changeset 1229
331a68645f67
parent 1228
853d3d76ba94 (current diff)
parent 1227
6a587ca99109 (diff)
child 1230
53555f58586f

Automated merge with http://waqas.ath.cx:8000/

--- a/net/httpclient_listener.lua	Sat May 30 02:06:04 2009 +0500
+++ b/net/httpclient_listener.lua	Fri May 29 22:06:21 2009 +0100
@@ -1,7 +1,7 @@
+local log = require "util.logger".init("httpclient_listener");
 
 local connlisteners_register = require "net.connlisteners".register;
 
-
 local requests = {}; -- Open requests
 local buffers = {}; -- Buffers of partial lines
 
@@ -11,7 +11,7 @@
 	local request = requests[conn];
 
 	if not request then
-		print("NO REQUEST!! for "..tostring(conn));
+		log("warn", "Received response from connection %s with no request attached!", tostring(conn));
 		return;
 	end
 
@@ -29,7 +29,7 @@
 end
 
 function httpclient.register_request(conn, req)
-	print("Registering a request for "..tostring(conn));
+	log("debug", "Attaching request %s to connection %s", tostring(req.id or req), tostring(conn));
 	requests[conn] = req;
 end
 

mercurial