Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity

Add newline to error_logger log format

Browse Source
This commit is contained in:
Christophe Romain 2019-03-15 11:51:48 +01:00
parent 5077d39600
commit 4a920dca5a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ejabberd_system_monitor.erl
View File

@ -94,7 +94,7 @@ handle_event({set_alarm, {process_memory_high_watermark, Pid}}, State) ->
case proc_stat(Pid, get_app_pids()) of case proc_stat(Pid, get_app_pids()) of
#proc_stat{name = Name} = ProcStat -> #proc_stat{name = Name} = ProcStat ->
error_logger:warning_msg( error_logger:warning_msg(
"Process ~p consumes more than 5% of OS memory (~s)", "Process ~p consumes more than 5% of OS memory (~s)~n",
[Name, format_proc(ProcStat)]), [Name, format_proc(ProcStat)]),
handle_overload(State), handle_overload(State),
{ok, State}; {ok, State};
@ -104,7 +104,7 @@ handle_event({set_alarm, {process_memory_high_watermark, Pid}}, State) ->
handle_event({clear_alarm, process_memory_high_watermark}, State) -> handle_event({clear_alarm, process_memory_high_watermark}, State) ->
{ok, State}; {ok, State};
handle_event(Event, State) -> handle_event(Event, State) ->
error_logger:warning_msg("unexpected event: ~p", [Event]), error_logger:warning_msg("unexpected event: ~p~n", [Event]),
{ok, State}. {ok, State}.
handle_call(_Request, State) -> handle_call(_Request, State) ->
@ -114,7 +114,7 @@ handle_info({timeout, _TRef, handle_overload}, State) ->
handle_overload(State), handle_overload(State),
{ok, restart_timer(State)}; {ok, restart_timer(State)};
handle_info(Info, State) -> handle_info(Info, State) ->
error_logger:warning_msg("unexpected info: ~p", [Info]), error_logger:warning_msg("unexpected info: ~p~n", [Info]),
{ok, State}. {ok, State}.
terminate(_Reason, _State) -> terminate(_Reason, _State) ->
@ -141,7 +141,7 @@ handle_overload(_State, Procs) ->
"The system is overloaded with ~b messages " "The system is overloaded with ~b messages "
"queued by ~b process(es) (~b%) " "queued by ~b process(es) (~b%) "
"from the following applications: ~s; " "from the following applications: ~s; "
"the top processes are:~n~s", "the top processes are:~n~s~n",
[TotalMsgs, ProcsNum, [TotalMsgs, ProcsNum,
round(ProcsNum*100/length(Procs)), round(ProcsNum*100/length(Procs)),
format_apps(Apps), format_apps(Apps),
@ -274,7 +274,7 @@ do_kill(Stats, Threshold) ->
true -> true ->
error_logger:warning_msg( error_logger:warning_msg(
"Unable to kill process ~p from whitelisted " "Unable to kill process ~p from whitelisted "
"application ~p", [Name, App]), "application ~p~n", [Name, App]),
false; false;
false -> false ->
case kill_proc(Name) of case kill_proc(Name) of
@ -291,7 +291,7 @@ do_kill(Stats, Threshold) ->
TotalKilled = length(Killed), TotalKilled = length(Killed),
if TotalKilled > 0 -> if TotalKilled > 0 ->
error_logger:error_msg( error_logger:error_msg(
"Killed ~b process(es) consuming more than ~b message(s) each", "Killed ~b process(es) consuming more than ~b message(s) each~n",
[TotalKilled, Threshold]); [TotalKilled, Threshold]);
true -> true ->
ok ok