# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1467983564 -7200
# Node ID 9a73c85baffe9f8f177b1e85daec7e405a8c7908
# Parent  f1923f00b7de4aa38c2ae0f8ec12798639b9a1c7# Parent  f28fa742def3412be247f5e70e919bb8c276562e
Merge 0.10->trunk

diff -r f1923f00b7de -r 9a73c85baffe plugins/mod_c2s.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'};
 
diff -r f1923f00b7de -r 9a73c85baffe plugins/mod_s2s/mod_s2s.lua
--- 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 };