From 1bf80e861da8d6771cd296e672168ccd14899ed6 Mon Sep 17 00:00:00 2001 From: Badlop Date: Tue, 19 Dec 2023 20:21:19 +0100 Subject: [PATCH] Elixir: Fix: FORMATTER ERROR: bad return value (4087) This is required since Elixir 1.15 when starting ejabberd with: ./configure --with-rebar=mix make relive make relive && ejabberdctl iexlive make install && ejabberdctl iexlive Reference: https://elixir-lang.org/blog/2023/06/19/elixir-v1-15-0-released/ https://hexdocs.pm/logger/Logger.Formatter.html#module-formatting --- src/ejabberd_logger.erl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/ejabberd_logger.erl b/src/ejabberd_logger.erl index 736d6c20c..897a4352e 100644 --- a/src/ejabberd_logger.erl +++ b/src/ejabberd_logger.erl @@ -340,8 +340,20 @@ progress_filter(#{level:=info,msg:={report,#{label:={_,progress}}}} = Event, _) progress_filter(Event, _) -> Event. +-ifdef(ELIXIR_ENABLED). +console_template() -> + case (false /= code:is_loaded('Elixir.Logger')) + andalso + lists:keymember(default_formatter, 1, 'Elixir.Logger':module_info(exports)) of + true -> + [date, " ", time, " [", level, "] ", message, "\n"]; + false -> + [time, " [", level, "] " | msg()] + end. +-else. console_template() -> [time, " [", level, "] " | msg()]. +-endif. file_template() -> [time, " [", level, "] ", pid,