diff --git a/src/ejabberd_options.erl b/src/ejabberd_options.erl index c30cc072f5a..5963a684b65 100644 --- a/src/ejabberd_options.erl +++ b/src/ejabberd_options.erl @@ -85,6 +85,8 @@ opt_type(auth_external_user_exists_check) -> econf:bool(); opt_type(auth_use_cache) -> econf:bool(); +opt_type(auth_profile_opts) -> + econf:any(); opt_type(c2s_cafile) -> econf:file(); opt_type(c2s_ciphers) -> @@ -525,6 +527,7 @@ options() -> {queue_type, ram}, {version, ejabberd_config:version()}, %% Other options + {auth_profile_opts, []}, {acl, []}, {access_rules, []}, {acme, #{}}, diff --git a/src/elixir_logger_backend.erl b/src/elixir_logger_backend.erl index 0579528b727..fcc210b70e9 100644 --- a/src/elixir_logger_backend.erl +++ b/src/elixir_logger_backend.erl @@ -41,7 +41,21 @@ init(Opts) -> %% @private handle_event({log, LagerMsg}, State) -> - #{mode := Mode, truncate := Truncate, level := MinLevel, utc_log := UTCLog} = 'Elixir.Logger.Config':'__data__'(), + Truncate = case 'Elixir.Application':fetch_env(logger, truncate) of + {ok, ElixirTruncate} -> ElixirTruncate; + _ -> 8192 + end, + + UTCLog = case 'Elixir.Application':fetch_env(logger, utc_log) of + {ok, ElixirUTCLog} -> ElixirUTCLog; + _ -> false + end, + + MinLevel = case 'Elixir.Application':fetch_env(logger, level) of + {ok, ElixirLevel} -> ElixirLevel; + _ -> false + end, + MsgLevel = severity_to_level(lager_msg:severity(LagerMsg)), case {lager_util:is_loggable(LagerMsg, lager_util:level_to_num(State#state.level), ?MODULE), 'Elixir.Logger':compare_levels(MsgLevel, MinLevel)} of @@ -56,7 +70,7 @@ handle_event({log, LagerMsg}, State) -> erlang:process_info(self(), group_leader); _ -> {group_leader, self()} end, - notify(Mode, {MsgLevel, GroupLeader, {'Elixir.Logger', Message, Timestamp, Metadata}}), + notify(async, {MsgLevel, GroupLeader, {'Elixir.Logger', Message, Timestamp, Metadata}}), {ok, State}; _ -> {ok, State}