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

Comparison

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
comparison
equal deleted inserted replaced
2744:887d3a0e1e4e 2879:94299e640ed0
174 if s2s_attempt_connect(session, err) then 174 if s2s_attempt_connect(session, err) then
175 (session.log or log)("debug", "...so we're going to try another target"); 175 (session.log or log)("debug", "...so we're going to try another target");
176 return; -- Session lives for now 176 return; -- Session lives for now
177 end 177 end
178 end 178 end
179 (session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err)); 179 (session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "closed"));
180 s2s_destroy_session(session, err); 180 s2s_destroy_session(session, err);
181 sessions[conn] = nil; 181 sessions[conn] = nil;
182 session = nil; 182 session = nil;
183 end 183 end
184 end 184 end