mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 14:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_c2s, mod_s2s: Switch connection counting to 'amount' type and enumerate once per statistics interval

Browse source
This commit is contained in:
Kim Alvefur 2016-09-12 15:01:16 +02:00
parent 582a2180f2
commit 522f448b35
2 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/mod_c2s.lua
View file

@ -27,7 +27,7 @@ local c2s_timeout = module:get_option_number("c2s_timeout");
local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5);
local opt_keepalives = module:get_option_boolean("c2s_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true));
local measure_connections = module:measure("connections", "counter");
local measure_connections = module:measure("connections", "amount");
local sessions = module:shared("sessions");
local core_process_stanza = prosody.core_process_stanza;
@ -36,7 +36,7 @@ local hosts = prosody.hosts;
local stream_callbacks = { default_ns = "jabber:client" };
local listener = {};
do
module:hook("stats-update", function ()
-- Connection counter resets to 0 on load and reload
-- Bump it up to current value
local count = 0;
@ -44,7 +44,7 @@ do
count = count + 1;
end
measure_connections(count);
end
end);
--- Stream events handlers
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
@ -207,7 +207,6 @@ end, 200);
--- Port listener
function listener.onconnect(conn)
measure_connections(1);
local session = sm_new_session(conn);
sessions[conn] = session;
@ -276,7 +275,6 @@ function listener.onincoming(conn, data)
end
function listener.ondisconnect(conn, err)
measure_connections(-1);
local session = sessions[conn];
if session then
(session.log or log)("info", "Client disconnected: %s", err or "connection closed");