Comparison

plugins/mod_s2s/mod_s2s.lua @ 7647:e9d7a409e236

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 31 Aug 2016 16:25:21 +0100
parent 7639:eab307f7435c
parent 7642:2dcb402c4a0d
child 7666:03aa330562ed
comparison
equal deleted inserted replaced
7641:5eef792bb2e1 7647:e9d7a409e236
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 });
669 end 668 end
670 (session.log or log)("debug", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "connection closed")); 669 (session.log or log)("debug", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "connection closed"));
671 s2s_destroy_session(session, err); 670 s2s_destroy_session(session, err);
672 end 671 end
673 end 672 end