diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-07-28 01:14:31 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-07-28 01:14:31 +0100 |
| commit | 81bef2c93b53e006cbeebdffc80040af6b4daf68 (patch) | |
| tree | 2732225257e7b8ade28695dad7c0df3f7cea00b1 /core/s2smanager.lua | |
| parent | 8eec29745633bd84c2d325d42dbeeb4afd37d516 (diff) | |
| parent | 47619af14cd24fcb48b4d2b4c4653f72b882087e (diff) | |
| download | prosody-81bef2c93b53e006cbeebdffc80040af6b4daf68.tar.gz prosody-81bef2c93b53e006cbeebdffc80040af6b4daf68.zip | |
Merge with Florob
Diffstat (limited to 'core/s2smanager.lua')
| -rw-r--r-- | core/s2smanager.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 9e0a91d1..76dde9d2 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -74,7 +74,7 @@ function make_authenticated(session, host) else return false; end - session.log("debug", "connection %s->%s is now authenticated for %s", session.from_host or "(unknown)", session.to_host or "(unknown)", host); + session.log("debug", "connection %s->%s is now authenticated for %s", session.from_host, session.to_host, host); mark_connected(session); @@ -87,7 +87,7 @@ function mark_connected(session) local from, to = session.from_host, session.to_host; - session.log("info", session.direction.." s2s connection "..from.."->"..to.." complete"); + session.log("info", "%s s2s connection %s->%s complete", session.direction, from, to); local event_data = { session = session }; if session.type == "s2sout" then @@ -105,7 +105,7 @@ function mark_connected(session) if session.direction == "outgoing" then if sendq then - session.log("debug", "sending "..#sendq.." queued stanzas across new outgoing connection to "..session.to_host); + session.log("debug", "sending %d queued stanzas across new outgoing connection to %s", #sendq, session.to_host); for i, data in ipairs(sendq) do send(data[1]); sendq[i] = nil; @@ -133,7 +133,7 @@ local resting_session = { -- Resting, not dead function retire_session(session, reason) local log = session.log or log; for k in pairs(session) do - if k ~= "trace" and k ~= "log" and k ~= "id" then + if k ~= "trace" and k ~= "log" and k ~= "id" and k ~= "conn" then session[k] = nil; end end |