From 82eda718f244e2e67484ba75e853a06d4949f767 Mon Sep 17 00:00:00 2001 From: Andrew Thompson Date: Sun, 11 Mar 2012 22:27:21 -0400 Subject: [PATCH] Update the console backend to use new default formatter for verbose mode --- src/lager_console_backend.erl | 5 +---- src/lager_default_formatter.erl | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lager_console_backend.erl b/src/lager_console_backend.erl index a0a184b..84b9b97 100644 --- a/src/lager_console_backend.erl +++ b/src/lager_console_backend.erl @@ -33,18 +33,15 @@ -include("lager.hrl"). --define(VERBOSE_FORMAT,[date, " ", time, " [", severity, "] ", pid, "@", module,":", function, ":",line," ", message, "\r\n"]). -define(TERSE_FORMAT,[time, " [", severity,"] ", message, "\r\n"]). %% @private init(Level) when is_atom(Level) -> init([Level,{lager_default_formatter,?TERSE_FORMAT}]); init([Level, true]) -> % for backwards compatibility - init([Level,{lager_default_formatter,?VERBOSE_FORMAT}]); + init([Level,{lager_default_formatter,[{eol, "\r\n"}]}]); init([Level,false]) -> % for backwards compatibility init([Level,{lager_default_formatter,?TERSE_FORMAT}]); -init([Level,{Formatter,[]}]) -> - init([Level,{Formatter,[]}]); init([Level,{Formatter,FormatterConfig}]) when is_atom(Level), is_atom(Formatter)-> case lists:member(Level, ?LEVELS) of true -> diff --git a/src/lager_default_formatter.erl b/src/lager_default_formatter.erl index a8ba373..79c4762 100644 --- a/src/lager_default_formatter.erl +++ b/src/lager_default_formatter.erl @@ -37,6 +37,8 @@ %% @end -spec format(#lager_log_message{},list()) -> any(). format(#lager_log_message{}=Msg,[]) -> + format(Msg, [{eol, "\n"}]); +format(#lager_log_message{}=Msg,[{eol, EOL}]) -> format(Msg, [date, " ", time, " [", severity, "] ", {pid, ""}, @@ -45,7 +47,7 @@ format(#lager_log_message{}=Msg,[]) -> module, {function, [":", function], ""}, {line, [":",line], ""}], ""}, - " ", message, "\n"]); + " ", message, EOL]); format(Message,Config) -> [ output(V,Message) || V <- Config ].