diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-09-13 14:08:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-13 14:08:47 +0100 |
| commit | 3a04b19fa38e427f6aa661958e9c07e42c7ad782 (patch) | |
| tree | 7020b37f680d5d4436c946120d9847f0bceacc97 /src | |
| parent | 107fe5f0f50e5192485cb5ffbf042884e526a4e8 (diff) | |
| parent | 7e190225f823e3d3d216627a47fca90b9b55d309 (diff) | |
| download | rspamd-3a04b19fa38e427f6aa661958e9c07e42c7ad782.tar.gz rspamd-3a04b19fa38e427f6aa661958e9c07e42c7ad782.zip | |
Merge pull request #950 from fatalbanana/rlimit3
More ratelimit cleanup
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/lua/ratelimit.lua | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/lua/ratelimit.lua b/src/plugins/lua/ratelimit.lua index 67fd51aba..35b0a6cac 100644 --- a/src/plugins/lua/ratelimit.lua +++ b/src/plugins/lua/ratelimit.lua @@ -162,8 +162,6 @@ local function dynamic_rate_key(task, rtype) for _, v in ipairs(key_keywords) do if (custom_keywords[v] and type(custom_keywords[v]['condition']) == 'function') then if not custom_keywords[v]['condition']() then return nil end - elseif (keywords[v] and type(keywords[v]['condition']) == 'function') then - if not keywords[v]['condition']() then return nil end end local ret if custom_keywords[v] and type(custom_keywords[v]['get_value']) == 'function' then |