prosody
94299e640ed0
net/xmppserver_listener.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

net/xmppserver_listener.lua @ 2879:94299e640ed0

Merge with 0.7 (and indirectly 0.6.2)
author Matthew Wild <mwild1@gmail.com>
date Mon, 15 Mar 2010 03:18:33 +0000
parent 2745:5cedad1bcb28
child 2925:692b3c6c5bd2
line wrap: on
line diff
--- a/net/xmppserver_listener.lua	Fri Mar 05 18:35:23 2010 +0000
+++ b/net/xmppserver_listener.lua	Mon Mar 15 03:18:33 2010 +0000
@@ -176,7 +176,7 @@
 				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;