aboutsummaryrefslogtreecommitdiffstats
path: root/net/xmppserver_listener.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-10-26 23:30:15 +0000
committerMatthew Wild <mwild1@gmail.com>2009-10-26 23:30:15 +0000
commitf0b9e5befac2aef2c57d68d1441faed693bacea6 (patch)
tree6b0f9746afaa3356db58aa3a7ef0cc533bd87d04 /net/xmppserver_listener.lua
parent493cfc98173579fe924d06b353cf5416471dec1c (diff)
parentc73ece03d8efcc4b46712ff32b7da610cb21dc4f (diff)
downloadprosody-f0b9e5befac2aef2c57d68d1441faed693bacea6.tar.gz
prosody-f0b9e5befac2aef2c57d68d1441faed693bacea6.zip
Merge with trunk
Diffstat (limited to 'net/xmppserver_listener.lua')
-rw-r--r--net/xmppserver_listener.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index f7ea35f7..fa6acbb7 100644
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -61,8 +61,8 @@ local function session_reset_stream(session)
function session.data(conn, data)
local ok, err = parser:parse(data);
if ok then return; end
- (log or session.log)("warn", "Received invalid XML: %s", data);
- (log or session.log)("warn", "Problem was: %s", err);
+ (session.log or log)("warn", "Received invalid XML: %s", data);
+ (session.log or log)("warn", "Problem was: %s", err);
session:close("xml-not-well-formed");
end