diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-03-14 14:40:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 14:40:53 +0000 |
| commit | 3f4c9708bf10f7f9b1f7a65678be40da694c25cb (patch) | |
| tree | b8d8afbdf80320d1bde0c3828189940bfc60a137 | |
| parent | 629f9ff70080f13a56056a7ecc2fa9ce611b4cf9 (diff) | |
| parent | 9f01df6f5a74314c2c3478bc672125e894ada64f (diff) | |
| download | rspamd-3f4c9708bf10f7f9b1f7a65678be40da694c25cb.tar.gz rspamd-3f4c9708bf10f7f9b1f7a65678be40da694c25cb.zip | |
Merge pull request #1523 from fatalbanana/confighelp
[Proxy] Fix max_retries option
| -rw-r--r-- | src/rspamd_proxy.c | 2 | ||||
| -rw-r--r-- | test/functional/cases/150_rspamadm.robot | 5 |
2 files changed, 6 insertions, 1 deletions
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), 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 |