diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-08-31 16:25:21 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-08-31 16:25:21 +0100 |
commit | 37913e5ce81c5e0b404aa2389102e0a30b00c111 (patch) | |
tree | 4c56350b49c07b9ab63a705fc167339ef54dca96 /plugins/mod_s2s | |
parent | f25bb95b8680adffa070c07fa762bde6af383957 (diff) | |
parent | e2dbea53b4aa078633e6270da25a633741d4ae23 (diff) | |
download | prosody-37913e5ce81c5e0b404aa2389102e0a30b00c111.tar.gz prosody-37913e5ce81c5e0b404aa2389102e0a30b00c111.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s')
-rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index 3d5eddd7..a6fdd254 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -665,7 +665,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); |