aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-25 18:03:44 +0200
committerKim Alvefur <zash@zash.se>2015-09-25 18:03:44 +0200
commit82e11141e9c48be266f0de78192fdc050e9ed28d (patch)
tree1e32c314fb85cbf368bdbedfe0f8eb757cc79d45 /plugins
parent8a539ac1ee9de45326aabefaa124bc7792134521 (diff)
parent777da29e5904b91277b087f2ee207545671edf03 (diff)
downloadprosody-82e11141e9c48be266f0de78192fdc050e9ed28d.tar.gz
prosody-82e11141e9c48be266f0de78192fdc050e9ed28d.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua5
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index ff8ef45d..597aec6c 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -614,6 +614,11 @@ function listener.onstatus(conn, status)
end
end
+function listener.ontimeout(conn)
+ -- Called instead of onconnect when the connection times out
+ measure_connections(1);
+end
+
function listener.ondisconnect(conn, err)
measure_connections(-1);
local session = sessions[conn];