diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-08-17 20:08:41 +0100 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-08-17 20:08:41 +0100 |
commit | de9ca456b037b5db3fb45b8f6be148e9ba32c9db (patch) | |
tree | 56d9ef9a8188fc5f7e990129b9bc37d2d574ff30 /src/plugins/lua | |
parent | 659ba80340ea403a73e50d23e831ac95c18e645f (diff) | |
download | rspamd-de9ca456b037b5db3fb45b8f6be148e9ba32c9db.tar.gz rspamd-de9ca456b037b5db3fb45b8f6be148e9ba32c9db.zip |
[Minor] Fix init logic
Diffstat (limited to 'src/plugins/lua')
-rw-r--r-- | src/plugins/lua/multimap.lua | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua index 8ba0a164d..d20885525 100644 --- a/src/plugins/lua/multimap.lua +++ b/src/plugins/lua/multimap.lua @@ -884,18 +884,20 @@ local function add_multimap_rule(key, newrule) rspamd_logger.errx(rspamd_config, 'mempool map requires variable') return nil end - if newrule['type'] == 'selector' and not newrule['selector'] then - rspamd_logger.errx(rspamd_config, 'selector map requires selector definition') - return nil - else - local selector = lua_selectors.parse_selector(rspamd_config, newrule['selector']) - - if not selector then - rspamd_logger.errx(rspamd_config, 'selector map has invalid selector') + if newrule['type'] == 'selector' then + if not newrule['selector'] then + rspamd_logger.errx(rspamd_config, 'selector map requires selector definition') return nil - end + else + local selector = lua_selectors.parse_selector(rspamd_config, newrule['selector']) - newrule.selector = selector + if not selector then + rspamd_logger.errx(rspamd_config, 'selector map has invalid selector') + return nil + end + + newrule.selector = selector + end end -- Check cdb flag if type(newrule['map']) == 'string' and string.find(newrule['map'], '^cdb://.*$') then |