prosody
39789f1669cb
plugins/mod_s2s/mod_s2s.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

plugins/mod_s2s/mod_s2s.lua @ 6861:39789f1669cb

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 25 Sep 2015 18:03:44 +0200
parent 6847:c314e9142e9d
parent 6848:32327c80710b
child 6905:0e81e3dab896
comparison
equal deleted inserted replaced
6847:c314e9142e9d 6861:39789f1669cb
612 session:open_stream(session.from_host, session.to_host); 612 session:open_stream(session.from_host, session.to_host);
613 end 613 end
614 end 614 end
615 end 615 end
616 616
617 function listener.ontimeout(conn)
618 -- Called instead of onconnect when the connection times out
619 measure_connections(1);
620 end
621
617 function listener.ondisconnect(conn, err) 622 function listener.ondisconnect(conn, err)
618 measure_connections(-1); 623 measure_connections(-1);
619 local session = sessions[conn]; 624 local session = sessions[conn];
620 if session then 625 if session then
621 sessions[conn] = nil; 626 sessions[conn] = nil;