# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1370125308 -3600
# Node ID edb06824a5a4febdafa14a29a712494ef2572e82
# Parent  892272432703f458e566848efacad1f8c0f63825
mod_muc_limits: Condense multiple dropped stanzas into a single log message every 5 seconds

diff -r 892272432703 -r edb06824a5a4 mod_muc_limits/mod_muc_limits.lua
--- a/mod_muc_limits/mod_muc_limits.lua	Sat Jun 01 23:20:09 2013 +0100
+++ b/mod_muc_limits/mod_muc_limits.lua	Sat Jun 01 23:21:48 2013 +0100
@@ -2,6 +2,7 @@
 local jid = require "util.jid";
 local st = require "util.stanza";
 local new_throttle = require "util.throttle".create;
+local t_insert, t_concat = table.insert, table.concat;
 
 local xmlns_muc = "http://jabber.org/protocol/muc";
 
@@ -9,6 +10,14 @@
 local burst = math.max(module:get_option_number("muc_burst_factor", 6), 1);
 
 local max_nick_length = module:get_option_number("muc_max_nick_length", 23); -- Default chosen through scientific methods
+local dropped_count = 0;
+local dropped_jids;
+
+local function log_dropped()
+	module:log("warn", "Dropped %d stanzas from %d JIDs: %s", dropped_count, #dropped_jids, t_concat(dropped_jids, ", "));
+	dropped_count = 0;
+	dropped_jids = nil;
+end
 
 local function handle_stanza(event)
 	local origin, stanza = event.origin, event.stanza;
@@ -35,7 +44,15 @@
 		room.throttle = throttle;
 	end
 	if not throttle:poll(1) then
-		module:log("warn", "Dropping stanza for %s@%s from %s, over rate limit", dest_room, dest_host, from_jid);
+		module:log("debug", "Dropping stanza for %s@%s from %s, over rate limit", dest_room, dest_host, from_jid);
+		if not dropped_jids then
+			dropped_jids = { [from_jid] = true, from_jid };
+			module:add_timer(5, log_dropped);
+		elseif not dropped_jids[from_jid] then
+			dropped_jids[from_jid] = true;
+			t_insert(dropped_jids, from_jid);
+		end
+		dropped_count = dropped_count + 1;
 		local reply = st.error_reply(stanza, "wait", "policy-violation", "The room is currently overactive, please try again later");
 		local body = stanza:get_child_text("body");
 		if body then