Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 08 Jul 2016 15:12:44 +0200
changeset 7470 9a73c85baffe
parent 7468 f1923f00b7de (current diff)
parent 7469 f28fa742def3 (diff)
child 7480 f9e470026042
Merge 0.10->trunk
plugins/mod_c2s.lua
plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_c2s.lua	Thu Jul 07 23:12:25 2016 +0100
+++ b/plugins/mod_c2s.lua	Fri Jul 08 15:12:44 2016 +0200
@@ -38,6 +38,16 @@
 local listener = {};
 local runner_callbacks = {};
 
+do
+	-- Connection counter resets to 0 on load and reload
+	-- Bump it up to current value
+	local count = 0;
+	for _ in pairs(sessions) do
+		count = count + 1;
+	end
+	measure_connections(count);
+end
+
 --- Stream events handlers
 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
 
--- a/plugins/mod_s2s/mod_s2s.lua	Thu Jul 07 23:12:25 2016 +0100
+++ b/plugins/mod_s2s/mod_s2s.lua	Fri Jul 08 15:12:44 2016 +0200
@@ -46,6 +46,16 @@
 
 local log = module._log;
 
+do
+	-- Connection counter resets to 0 on load and reload
+	-- Bump it up to current value
+	local count = 0;
+	for _ in pairs(sessions) do
+		count = count + 1;
+	end
+	measure_connections(count);
+end
+
 --- Handle stanzas to remote domains
 
 local bouncy_stanzas = { message = true, presence = true, iq = true };