From ab34bf8a9361c4b6da4fa20b092c6a8028c34f9c Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 12 Sep 2016 15:01:16 +0200 Subject: mod_c2s, mod_s2s: Switch connection counting to 'amount' type and enumerate once per statistics interval --- plugins/mod_s2s/mod_s2s.lua | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'plugins/mod_s2s/mod_s2s.lua') diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index ae9a746a..d190d631 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -37,13 +37,13 @@ local secure_domains, insecure_domains = 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 @@ do count = count + 1; end measure_connections(count); -end +end); --- Handle stanzas to remote domains @@ -588,7 +588,6 @@ local function initialize_session(session) 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 @@ 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]; if session then sessions[conn] = nil; -- cgit v1.2.3