aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-05-30 13:49:38 +0100
committerMatthew Wild <mwild1@gmail.com>2009-05-30 13:49:38 +0100
commit9ce3ead7b7e27b36e67b2694530c052b645bfd59 (patch)
treec36d1229f21c6d1a7b5699bcaa4000ec35902de9
parentb4359c6b35505c62116b1815a4ef57a042d65900 (diff)
parent175256488b9b8d4f39668e515213b9fe7af261b6 (diff)
downloadprosody-9ce3ead7b7e27b36e67b2694530c052b645bfd59.tar.gz
prosody-9ce3ead7b7e27b36e67b2694530c052b645bfd59.zip
Automated merge with http://waqas.ath.cx:8000/
-rw-r--r--core/stanza_router.lua4
-rw-r--r--net/httpclient_listener.lua6
2 files changed, 5 insertions, 5 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 35593b35..d4cbcd59 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -141,7 +141,7 @@ function core_post_stanza(origin, stanza)
local event_data = {origin=origin, stanza=stanza};
if origin.full_jid then -- c2s connection
- if hosts[origin.host].events.fire_event('pre-'..stanza.name..to_type, event_data); then return; end -- do preprocessing
+ if hosts[origin.host].events.fire_event('pre-'..stanza.name..to_type, event_data) then return; end -- do preprocessing
end
local h = hosts[to_bare] or hosts[host or origin.host];
if h then
@@ -149,7 +149,7 @@ function core_post_stanza(origin, stanza)
component_handle_stanza(origin, stanza);
return;
else
- if h.events.fire_event(stanza.name..to_type, event_data); then return; end -- do processing
+ if h.events.fire_event(stanza.name..to_type, event_data) then return; end -- do processing
end
else -- non-local recipient
core_route_stanza(origin, stanza);
diff --git a/net/httpclient_listener.lua b/net/httpclient_listener.lua
index 9c4f23f3..a648743f 100644
--- a/net/httpclient_listener.lua
+++ b/net/httpclient_listener.lua
@@ -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 @@ function httpclient.listener(conn, data)
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 @@ function httpclient.disconnect(conn, err)
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