Merge 0.10->trunk

diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index a690e9be7f112931f5f77680d21c77de482b0884..703c4ac7ab4054f49c3eb10683fe55acb62c2e36 100644 (file)
--- 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 c0eaea01216b1e68beb9d83684371b785c08e25d..fe674b55d961b7755d808fee9f68733be2dc2e5d 100644 (file)
--- 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 };