--- a/plugins/mod_s2s/mod_s2s.lua Wed Sep 07 19:32:29 2016 +0100
+++ b/plugins/mod_s2s/mod_s2s.lua Mon Sep 12 15:01:16 2016 +0200
@@ -37,13 +37,13 @@
module:get_option_set("s2s_secure_domains", {})._items, module:get_option_set("s2s_insecure_domains", {})._items;
local require_encryption = module:get_option_boolean("s2s_require_encryption", false);
-local measure_connections = module:measure("connections", "counter");
+local measure_connections = module:measure("connections", "amount");
local sessions = module:shared("sessions");
local log = module._log;
-do
+module:hook("stats-update", function ()
-- Connection counter resets to 0 on load and reload
-- Bump it up to current value
local count = 0;
@@ -51,7 +51,7 @@
count = count + 1;
end
measure_connections(count);
-end
+end);
--- Handle stanzas to remote domains
@@ -588,7 +588,6 @@
end
function listener.onconnect(conn)
- measure_connections(1);
conn:setoption("keepalive", opt_keepalives);
local session = sessions[conn];
if not session then -- New incoming connection
@@ -619,13 +618,7 @@
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];
if session then
sessions[conn] = nil;