Merge 0.10->trunk

1 files changed, 3 insertions, 5 deletions

diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 18375248..7eebaf2d 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -28,7 +28,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;
@@ -38,7 +38,7 @@ local stream_callbacks = { default_ns = "jabber:client" };
 local listener = {};
 local runner_callbacks = {};
 
-do
+module:hook("stats-update", function ()
 	-- Connection counter resets to 0 on load and reload
 	-- Bump it up to current value
 	local count = 0;
@@ -46,7 +46,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'};
@@ -218,7 +218,6 @@ end
 
 --- Port listener
 function listener.onconnect(conn)
-	measure_connections(1);
 	local session = sm_new_session(conn);
 	sessions[conn] = session;
 
@@ -291,7 +290,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");