diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-10-26 23:30:15 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-10-26 23:30:15 +0000 |
| commit | f0b9e5befac2aef2c57d68d1441faed693bacea6 (patch) | |
| tree | 6b0f9746afaa3356db58aa3a7ef0cc533bd87d04 /net | |
| parent | 493cfc98173579fe924d06b353cf5416471dec1c (diff) | |
| parent | c73ece03d8efcc4b46712ff32b7da610cb21dc4f (diff) | |
| download | prosody-f0b9e5befac2aef2c57d68d1441faed693bacea6.tar.gz prosody-f0b9e5befac2aef2c57d68d1441faed693bacea6.zip | |
Merge with trunk
Diffstat (limited to 'net')
| -rw-r--r-- | net/xmppserver_listener.lua | 4 |
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 |