From: Vsevolod Stakhov Date: Tue, 21 Aug 2018 16:16:21 +0000 (+0100) Subject: [Minor] Improve errors logging X-Git-Tag: 1.8.0~226 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=017f995b4269e99993f3a7503f5f014859775649;p=rspamd.git [Minor] Improve errors logging --- diff --git a/src/plugins/lua/ratelimit.lua b/src/plugins/lua/ratelimit.lua index f59332f01..05b1f5ed8 100644 --- a/src/plugins/lua/ratelimit.lua +++ b/src/plugins/lua/ratelimit.lua @@ -647,10 +647,24 @@ if opts then fun.each(function(t, lim) local buckets if type(lim) == 'table' and lim.selector and lim.bucket then + local selector = lua_selectors.parse_selector(rspamd_config, lim.selector) + if not selector then + rspamd_logger.errx(rspamd_config, 'bad ratelimit selector for %s: "%s"', + t, lim.selector) + return + end + local bucket = parse_limit(t, lim.bucket) + + if not bucket then + rspamd_logger.errx(rspamd_config, 'bad ratelimit bucket for %s: "%s"', + t, lim.bucket) + return + end settings.limits[t] = { - selector = lua_selectors.parse_selector(rspamd_config, lim.selector), - buckets = parse_limit(t, lim.bucket) + selector = selector, + buckets = bucket } + else buckets = parse_limit(t, lim) if buckets and #buckets > 0 then