aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-03-11 21:37:55 +0100
committerKim Alvefur <zash@zash.se>2012-03-11 21:37:55 +0100
commitc46d5d361b040b984882bb1917bcdc90d094ea94 (patch)
treed997c493c76c692b45a53737934ac4b65c37f89c
parenteca225365d45123176a348c70f788c4719b43ee1 (diff)
downloadprosody-c46d5d361b040b984882bb1917bcdc90d094ea94.tar.gz
prosody-c46d5d361b040b984882bb1917bcdc90d094ea94.zip
mod_s2s: Don't bounce sendq on failed connections since it's handled by s2smanager
-rw-r--r--plugins/s2s/mod_s2s.lua5
1 files changed, 1 insertions, 4 deletions
diff --git a/plugins/s2s/mod_s2s.lua b/plugins/s2s/mod_s2s.lua
index a496af57..1fa8ae81 100644
--- a/plugins/s2s/mod_s2s.lua
+++ b/plugins/s2s/mod_s2s.lua
@@ -107,10 +107,7 @@ module:hook("route/remote", function (event)
s2sout.initiate_connection(host_session);
if (not host_session.connecting) and (not host_session.conn) then
log("warn", "Connection to %s failed already, destroying session...", to_host);
- if not s2s_destroy_session(host_session, "Connection failed") then
- -- Already destroyed, we need to bounce our stanza
- host_session:bounce_sendq(host_session.destruction_reason);
- end
+ s2s_destroy_session(host_session, "Connection failed");
return false;
end
return true;