aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-08-31 11:42:03 +0100
committerMatthew Wild <mwild1@gmail.com>2016-08-31 11:42:03 +0100
commit9ab72215213a390238641ecb949b0b34d3533e77 (patch)
treea20b9cce60b5d69b26454d0e3b8a3a0ab52eeebd /plugins/mod_s2s
parentf6fd68b0dd80dc3f225b7e1ee710ecf369f8f283 (diff)
downloadprosody-9ab72215213a390238641ecb949b0b34d3533e77.tar.gz
prosody-9ab72215213a390238641ecb949b0b34d3533e77.zip
Backed out changeset a23b5cb8c22b
It was a nice idea, but our s2s connection logic is too complicated. The session may have been destroyed inside attempt_connection().
Diffstat (limited to 'plugins/mod_s2s')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua1
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index d6a82d40..ae9a746a 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -634,7 +634,6 @@ function listener.ondisconnect(conn, err)
if s2sout.attempt_connection(session, err) then
return; -- Session lives for now
end
- hosts[session.from_host].events.fire_event("s2s-connect-failure", { session = session, err = err });
end
(session.log or log)("debug", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "connection closed"));
s2s_destroy_session(session, err);