Software /
code /
prosody
Comparison
plugins/mod_s2s/mod_s2s.lua @ 7639:eab307f7435c
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Sun, 28 Aug 2016 05:15:13 +0200 |
parent | 7542:0f92dc8e8b88 |
parent | 7638:a23b5cb8c22b |
child | 7647:e9d7a409e236 |
comparison
equal
deleted
inserted
replaced
7637:cccea9136b2d | 7639:eab307f7435c |
---|---|
663 if err and session.direction == "outgoing" and session.notopen then | 663 if err and session.direction == "outgoing" and session.notopen then |
664 (session.log or log)("debug", "s2s connection attempt failed: %s", err); | 664 (session.log or log)("debug", "s2s connection attempt failed: %s", err); |
665 if s2sout.attempt_connection(session, err) then | 665 if s2sout.attempt_connection(session, err) then |
666 return; -- Session lives for now | 666 return; -- Session lives for now |
667 end | 667 end |
668 hosts[session.from_host].events.fire_event("s2s-connect-failure", { session = session, err = err }); | |
668 end | 669 end |
669 (session.log or log)("debug", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "connection closed")); | 670 (session.log or log)("debug", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "connection closed")); |
670 s2s_destroy_session(session, err); | 671 s2s_destroy_session(session, err); |
671 end | 672 end |
672 end | 673 end |