diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-15 03:18:33 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-15 03:18:33 +0000 |
| commit | ed5b64df222bf1e7abc5aa7801f387f090ad2214 (patch) | |
| tree | 9a83b9236b92ccbe0ad8d9277bcc565966b39be3 /net/xmppserver_listener.lua | |
| parent | 456cd9c62a173637f18d2c613e3514919369ad90 (diff) | |
| parent | 2650d367fa08e67a0a1f6cfbaaebf5fd3221ecd6 (diff) | |
| download | prosody-ed5b64df222bf1e7abc5aa7801f387f090ad2214.tar.gz prosody-ed5b64df222bf1e7abc5aa7801f387f090ad2214.zip | |
Merge with 0.7 (and indirectly 0.6.2)
Diffstat (limited to 'net/xmppserver_listener.lua')
| -rw-r--r-- | net/xmppserver_listener.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua index c9746ee1..8a3886ad 100644 --- a/net/xmppserver_listener.lua +++ b/net/xmppserver_listener.lua @@ -176,7 +176,7 @@ function xmppserver.ondisconnect(conn, err) return; -- Session lives for now end end - (session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err)); + (session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "closed")); s2s_destroy_session(session, err); sessions[conn] = nil; session = nil; |