diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-09-14 11:02:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-14 11:02:44 +0100 |
| commit | 560b93bf53b3f88ae4b39dd645138ab3ba5dc840 (patch) | |
| tree | 540dfa6e10eef748c5e538ff371408179340250c /src | |
| parent | 859480b9479c401f6ce14acbb45eb32f494b1a4e (diff) | |
| parent | 84334407eeee858fa59d3ba5ff2dbbfaa4e6c253 (diff) | |
| download | rspamd-560b93bf53b3f88ae4b39dd645138ab3ba5dc840.tar.gz rspamd-560b93bf53b3f88ae4b39dd645138ab3ba5dc840.zip | |
Merge pull request #952 from fatalbanana/rlimit4
Ratelimit fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/lua/ratelimit.lua | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/lua/ratelimit.lua b/src/plugins/lua/ratelimit.lua index 35b0a6cac..1df96c2c5 100644 --- a/src/plugins/lua/ratelimit.lua +++ b/src/plugins/lua/ratelimit.lua @@ -35,7 +35,6 @@ local rl_prefix = 'rl' local ip_score_lower_bound = 10 local ip_score_ham_multiplier = 1.1 local ip_score_spam_divisor = 1.1 -local user_data local rspamd_logger = require "rspamd_logger" local rspamd_redis = require "rspamd_redis" @@ -510,7 +509,11 @@ if opts then end if opts['whitelisted_user'] then - whitelisted_user = rspamd_config:add_map(opts['whitelisted_user'], 'Ratelimit whitelist user map') + whitelisted_user = rspamd_config:add_map({ + ['url'] = opts['whitelisted_user'], + ['description'] = 'Ratelimit whitelist user map', + ['type'] = 'set' + }) end if opts['symbol'] then @@ -535,7 +538,7 @@ if opts then end if opts['custom_keywords'] then - custom_keywords, user_data = dofile(opts['custom_keywords']) + custom_keywords = dofile(opts['custom_keywords']) end if opts['user_keywords'] then |