Changeset

7467:9a73c85baffe

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 08 Jul 2016 15:12:44 +0200
parents 7465:f1923f00b7de (current diff) 7466:f28fa742def3 (diff)
children 7477:f9e470026042
files plugins/mod_c2s.lua plugins/mod_s2s/mod_s2s.lua
diffstat 2 files changed, 20 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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 };