From d85cf7780c76e20b6d7290aa49050161bc352496 Mon Sep 17 00:00:00 2001 From: Evgeny Khramtsov Date: Fri, 14 Jun 2019 16:06:04 +0300 Subject: Introduce option 'captcha_url' Option 'captcha_host' is now deprecated in favor of 'captcha_url'. However, it's not replaced automatically at startup, i.e. both options are supported with 'captcha_url' being the preferred one. --- src/ejabberd_config_transformer.erl | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/ejabberd_config_transformer.erl') diff --git a/src/ejabberd_config_transformer.erl b/src/ejabberd_config_transformer.erl index 6d0af97f..d76126e7 100644 --- a/src/ejabberd_config_transformer.erl +++ b/src/ejabberd_config_transformer.erl @@ -194,6 +194,9 @@ filter(_Host, Opt, Val, _) when Opt == outgoing_s2s_timeout; Opt == s2s_dns_timeout -> warn_huge_timeout(Opt, Val), true; +filter(_Host, captcha_host, _, _) -> + warn_deprecated_option(captcha_host, captcha_url), + true; filter(Host, modules, ModOpts, State) -> NoDialbackHosts = maps:get(remove_s2s_dialback, State, []), ModOpts1 = lists:filter( @@ -443,6 +446,10 @@ warn_replaced_handler(Opt, {Path, Module}) -> "HTTP request handler: \"~s\" -> ~s. ~s", [Opt, Path, Module, adjust_hint()]). +warn_deprecated_option(OldOpt, NewOpt) -> + ?WARNING_MSG("Option '~s' is deprecated. Use option '~s' instead.", + [OldOpt, NewOpt]). + warn_replaced_option(OldOpt, NewOpt) -> ?WARNING_MSG("Option '~s' is deprecated and was automatically " "replaced by '~s'. ~s", -- cgit v1.2.3