aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s
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
commit9693f85d1b1078c49e49b172f7f3426bb1cb68a3 (patch)
tree1e32c314fb85cbf368bdbedfe0f8eb757cc79d45 /plugins/mod_s2s
parentb415f80bd6a623b351126d86deb4734984b7e32b (diff)
parente80179ba6e0ca23afc13fa2c723dbd5815bab5a5 (diff)
downloadprosody-9693f85d1b1078c49e49b172f7f3426bb1cb68a3.tar.gz
prosody-9693f85d1b1078c49e49b172f7f3426bb1cb68a3.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s')
-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];