From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 9 Jul 2018 13:40:21 +0000 (+0100)
Subject: [Minor] Count a new message when checking ratelimit burst
X-Git-Tag: 1.7.8~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b48746cfac2a2cb05082707a9ed505bafd328d40;p=rspamd.git

[Minor] Count a new message when checking ratelimit burst
---

diff --git a/src/plugins/lua/ratelimit.lua b/src/plugins/lua/ratelimit.lua
index 1d22f8838..2eb44b33a 100644
--- a/src/plugins/lua/ratelimit.lua
+++ b/src/plugins/lua/ratelimit.lua
@@ -81,7 +81,7 @@ local bucket_check_script = [[
    end
    dynb = tonumber(redis.call('HGET', KEYS[1], 'db')) / 10000.0
 
-   if burst * dynb > tonumber(KEYS[4]) then
+   if (burst + 1) * dynb > tonumber(KEYS[4]) then
     return {1, burst, dynr, dynb}
    end
   else
@@ -386,7 +386,7 @@ local function ratelimit_cb(task)
           return
         -- set INFO symbol and soft reject
         elseif settings.info_symbol then
-          task:insert_result(settings.info_symbol, 1.0, lim_name .. "(" .. prefix .. ")") 
+          task:insert_result(settings.info_symbol, 1.0, lim_name .. "(" .. prefix .. ")")
         end
         rspamd_logger.infox(task,
                 'ratelimit "%s(%s)" exceeded, (%s / %s): %s (%s:%s dyn)',