# HG changeset patch # User Matthew Wild # Date 1472640123 -3600 # Node ID 2dcb402c4a0dfc1810e8841a89bf7d4c3df910ad # Parent a23b5cb8c22bce907a7f7464496e8b3d12f4ea37 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(). diff -r a23b5cb8c22b -r 2dcb402c4a0d plugins/mod_s2s/mod_s2s.lua --- a/plugins/mod_s2s/mod_s2s.lua Sat Aug 27 13:40:10 2016 +0100 +++ b/plugins/mod_s2s/mod_s2s.lua Wed Aug 31 11:42:03 2016 +0100 @@ -634,7 +634,6 @@ 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);