diff options
| author | Andrew Lewis <nerf@judo.za.org> | 2016-09-05 08:48:00 +0200 |
|---|---|---|
| committer | Andrew Lewis <nerf@judo.za.org> | 2016-09-05 09:03:11 +0200 |
| commit | 68d3c2f3f31e24816f55d0c7e3838e199da1a9e0 (patch) | |
| tree | 7801548d26e338cd44a833034f4b55c3e784a42e /src/plugins/lua/replies.lua | |
| parent | df3173c9a8c3199349baaf11698ad23aa7f64e25 (diff) | |
| download | rspamd-68d3c2f3f31e24816f55d0c7e3838e199da1a9e0.tar.gz rspamd-68d3c2f3f31e24816f55d0c7e3838e199da1a9e0.zip | |
Revert "[Feature] Add common way to disable Lua modules"
This reverts commit f552edd887794a5086dcf93d36f8f82d83553196.
Conflicts:
src/plugins/lua/antivirus.lua
src/plugins/lua/asn.lua
src/plugins/lua/dcc.lua
src/plugins/lua/dmarc.lua
src/plugins/lua/emails.lua
src/plugins/lua/forged_recipients.lua
src/plugins/lua/greylist.lua
src/plugins/lua/hfilter.lua
src/plugins/lua/ip_score.lua
src/plugins/lua/maillist.lua
src/plugins/lua/mime_types.lua
src/plugins/lua/multimap.lua
src/plugins/lua/once_received.lua
src/plugins/lua/ratelimit.lua
src/plugins/lua/rbl.lua
src/plugins/lua/replies.lua
src/plugins/lua/rspamd_update.lua
src/plugins/lua/trie.lua
src/plugins/lua/whitelist.lua
Diffstat (limited to 'src/plugins/lua/replies.lua')
| -rw-r--r-- | src/plugins/lua/replies.lua | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/lua/replies.lua b/src/plugins/lua/replies.lua index d6793a3d8..9916dc3cf 100644 --- a/src/plugins/lua/replies.lua +++ b/src/plugins/lua/replies.lua @@ -108,14 +108,11 @@ local function replies_set(task) end local opts = rspamd_config:get_all_opt('replies') +if not (opts and type(opts) == 'table') then + rspamd_logger.infox(rspamd_config, 'module is unconfigured') + return +end if opts then - if not (opts and type(opts) == 'table') then - rspamd_logger.infox(rspamd_config, 'module is unconfigured') - return - elseif opts['enabled'] == false then - rspamd_logger.infox(rspamd_config, 'module is disabled') - return - end redis_params = rspamd_parse_redis_server('replies') if not redis_params then rspamd_logger.infox(rspamd_config, 'no servers are specified, disabling module') |