Mercurial > prosody-hg
comparison net/xmppserver_listener.lua @ 4541:05f5ec99da77
Merge with trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 22 Jan 2012 22:55:49 +0000 |
| parents | 7e2cf20aef74 |
| children |
comparison
equal
deleted
inserted
replaced
| 4530:40905e7bf680 | 4541:05f5ec99da77 |
|---|---|
| 176 end | 176 end |
| 177 | 177 |
| 178 function xmppserver.ondisconnect(conn, err) | 178 function xmppserver.ondisconnect(conn, err) |
| 179 local session = sessions[conn]; | 179 local session = sessions[conn]; |
| 180 if session then | 180 if session then |
| 181 if err and err ~= "closed" then | 181 if err and err ~= "closed" and session.type == "s2sout_unauthed" then |
| 182 (session.log or log)("debug", "s2s connection attempt failed: %s", err); | 182 (session.log or log)("debug", "s2s connection attempt failed: %s", err); |
| 183 if s2s_attempt_connect(session, err) then | 183 if s2s_attempt_connect(session, err) then |
| 184 (session.log or log)("debug", "...so we're going to try another target"); | 184 (session.log or log)("debug", "...so we're going to try another target"); |
| 185 return; -- Session lives for now | 185 return; -- Session lives for now |
| 186 end | 186 end |