From: Kim Alvefur <zash@zash.se>
Date: Fri, 8 Jul 2016 13:12:44 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=0ca860005cbdd6841778076c1c22fd324f7f58b8;hp=a1c272e4c48e807e798444a369700cfd1f0ab755;p=prosody.git

Merge 0.10->trunk
---

diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index a690e9be..703c4ac7 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -38,6 +38,16 @@ local stream_callbacks = { default_ns = "jabber:client" };
 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'};
 
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index c0eaea01..fe674b55 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -46,6 +46,16 @@ local runner_callbacks = {};
 
 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 };