summaryrefslogtreecommitdiff
path: root/src/ejabberd_config_transformer.erl
diff options
context:
space:
mode:
authorEvgeny Khramtsov <ekhramtsov@process-one.net>2019-10-18 19:12:32 +0300
committerEvgeny Khramtsov <ekhramtsov@process-one.net>2019-10-18 19:12:32 +0300
commite4a8afb15d6c995b294a60ed150b86775e2f6805 (patch)
treef1a739fe3737fce2cf0ea79740c9ebee92290287 /src/ejabberd_config_transformer.erl
parentFlatten strings in ejabberd_xmlrpc error results (diff)
Replace lager with built-in new logging API
This change requires Erlang/OTP-21.0 or higher. The commit also deprecates the following options: - log_rotate_date - log_rate_limit Furthermore, these options have no effect. The logger now fully relies on log_rotate_size, that cannot be 0 anymore. The loglevel option now accepts levels in literal formats. Those are: none, emergency, alert, critical, error, warning, notice, info, debug. Old integer values (0-5) are still supported and automatically converted into literal format.
Diffstat (limited to 'src/ejabberd_config_transformer.erl')
-rw-r--r--src/ejabberd_config_transformer.erl12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ejabberd_config_transformer.erl b/src/ejabberd_config_transformer.erl
index 18d79295..4dbb2a22 100644
--- a/src/ejabberd_config_transformer.erl
+++ b/src/ejabberd_config_transformer.erl
@@ -30,12 +30,6 @@ map_reduce(Y) ->
F = fun(Y1) ->
Y2 = (validator())(Y1),
Y3 = transform(Y2),
- if Y2 /= Y3 ->
- ?DEBUG("Transformed configuration:~ts~n",
- [misc:format_val({yaml, Y3})]);
- true ->
- ok
- end,
Y3
end,
econf:validate(F, Y).
@@ -148,6 +142,12 @@ filter(Host, Y, Acc) ->
filter(Host, Opt, Val, Acc)
end, Y).
+filter(_Host, log_rotate_date, _, _) ->
+ warn_removed_option(log_rotate_date),
+ false;
+filter(_Host, log_rate_limit, _, _) ->
+ warn_removed_option(log_rate_limit),
+ false;
filter(_Host, ca_path, _, _) ->
warn_removed_option(ca_path, ca_file),
false;