mod_c2s, mod_s2s: Bootstrap connection count statistic on module load

[prosody.git] / plugins / mod_c2s.lua

diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index d950225deccae9b0336788a2e27a318b32900ff9..e69bf461d2e3637219339dbaacd40ea577668cc2 100644 (file)
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -36,6 +36,16 @@ local hosts = prosody.hosts;
 local stream_callbacks = { default_ns = "jabber:client" };
 local listener = {};
 
+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'};
 
@@ -179,6 +189,9 @@ local function session_close(session, reason)
                        sm_destroy_session(session, reason);
                        conn:close();
                end
+       else
+               local reason = (reason and (reason.name or reason.text or reason.condition)) or reason;
+               sm_destroy_session(session, reason);
        end
 end