Skip to content

Commit

Permalink
Elixir: Fix: FORMATTER ERROR: bad return value (4087)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
badlop committed Jan 17, 2024
1 parent 5bb2beb commit 1bf80e8
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions src/ejabberd_logger.erl
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 1bf80e8

Please sign in to comment.