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/?p=prosody.git;a=commitdiff_plain;h=0ca860005cbdd6841778076c1c22fd324f7f58b8

Merge 0.10->trunk
---

0ca860005cbdd6841778076c1c22fd324f7f58b8
diff --cc plugins/mod_c2s.lua
index a690e9be,e69bf461..703c4ac7
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@@ -36,8 -35,17 +36,18 @@@ local hosts = prosody.hosts
  
  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 --cc plugins/mod_s2s/mod_s2s.lua
index c0eaea01,ea186cf0..fe674b55
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@@ -42,10 -41,18 +42,20 @@@ local measure_connections = module:meas
  
  local sessions = module:shared("sessions");
  
 +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 };