From 83b5732cda9a7f6c424ed704466cd8e85ea93131 Mon Sep 17 00:00:00 2001 From: Andrew Lewis Date: Tue, 14 Mar 2017 16:04:00 +0200 Subject: [Test] Test `rspamadm confighelp` doesn't yield an error --- test/functional/cases/150_rspamadm.robot | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/functional/cases/150_rspamadm.robot b/test/functional/cases/150_rspamadm.robot index bebcb0e0e..4e7b3c8aa 100644 --- a/test/functional/cases/150_rspamadm.robot +++ b/test/functional/cases/150_rspamadm.robot @@ -7,3 +7,8 @@ Config Test Should Match Regexp ${result.stderr} ^$ Should Match Regexp ${result.stdout} ^syntax OK$ Should Be Equal As Integers ${result.rc} 0 + +Config Help + ${result} = Run Process ${RSPAMADM} confighelp + Should Match Regexp ${result.stderr} ^$ + Should Be Equal As Integers ${result.rc} 0 -- cgit v1.2.3 From 9f01df6f5a74314c2c3478bc672125e894ada64f Mon Sep 17 00:00:00 2001 From: Andrew Lewis Date: Tue, 14 Mar 2017 16:10:14 +0200 Subject: [Fix] Proxy: max_retries option --- src/rspamd_proxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c index 8be244229..50567e32e 100644 --- a/src/rspamd_proxy.c +++ b/src/rspamd_proxy.c @@ -674,7 +674,7 @@ init_rspamd_proxy (struct rspamd_config *cfg) "Compare script to be executed"); rspamd_rcl_register_worker_option (cfg, type, - "timeout", + "max_retries", rspamd_rcl_parse_struct_integer, ctx, G_STRUCT_OFFSET (struct rspamd_proxy_ctx, max_retries), -- cgit v1.2.3