github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-11-14 11:09:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Merge branch 'platinumthinker-color_in_logs'"

Browse source 
This reverts commit 49930fe566, reversing
changes made to 6e6b0fd43f.
This commit is contained in:
Fred Hebert 2014-11-21 09:57:49 -05:00
parent 49930fe566
commit 4ba8f74787
4 changed files with 11 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
THANKS
View file

@ -129,4 +129,3 @@ Andras Horvath
Drew Varner
Roberto Aloi
Luis Rascao
Andrey Teplyashin

3
ebin/rebar.app
View file

@ -56,9 +56,6 @@
%% Default log level
{log_level, warn},
%% Log colored
{log_colored, true},
%% any_dir processing modules
{any_dir_modules, [
rebar_require_vsn,

31
inttest/logging/logging_rt.erl
View file

@ -40,40 +40,23 @@ run(_Dir) ->
SharedExpected = "==> logging_rt \\(compile\\)",
%% provoke ERROR due to an invalid app file
retest:log(info, "Check 'compile' failure output~n"),
{Error, Warn, Info, Debug} =
case application:get_env(rebar, log_colored) of
{ok, true} ->
{
"\\e\\[1m\\e\\[31mERROR: \\e\\[0m",
"\\e\\[33mWARN: \\e\\[0m",
"\\e\\[32mINFO: \\e\\[0m",
"\\e\\[34mDEBUG: \\e\\[0m"
};
_ ->
{
"ERROR: ",
"WARN: ",
"INFO: ",
"DEBUG: "
}
end,
ok = check_output("./rebar compile -q", should_fail,
[SharedExpected, Error],
[Warn, Info, Debug]),
[SharedExpected, "ERROR: "],
["WARN: ", "INFO: ", "DEBUG: "]),
%% fix bad app file
ok = file:write_file(?APP_FILE, app(logging, [])),
retest:log(info, "Check 'compile' success output~n"),
ok = check_output("./rebar compile", should_succeed,
[SharedExpected],
[Error, Warn, Info, Debug]),
["ERROR: ", "WARN: ", "INFO: ", "DEBUG: "]),
retest:log(info, "Check 'compile -v' success output~n"),
ok = check_output("./rebar compile -v", should_succeed,
[SharedExpected],
[Error, Info, Debug]),
["ERROR: ", "INFO: ", "DEBUG: "]),
retest:log(info, "Check 'compile -vv' success output~n"),
ok = check_output("./rebar compile -vv", should_succeed,
[SharedExpected, Debug],
[Error, Info]),
[SharedExpected, "DEBUG: "],
["ERROR: ", "INFO: "]),
ok.
check_output(Cmd, FailureMode, Expected, Unexpected) ->
@ -90,7 +73,7 @@ check_output(Cmd, FailureMode, Expected, Unexpected) ->
end.
check_output1(Cmd, Captured, Expected, Unexpected) ->
ReOpts = [{capture, all, list}, unicode],
ReOpts = [{capture, all, list}],
ExMatches =
lists:zf(
fun(Pattern) ->

43
src/rebar_log.erl
View file

@ -50,28 +50,19 @@ init(Config) ->
?WARN_LEVEL -> set_level(warn);
?INFO_LEVEL -> set_level(info);
?DEBUG_LEVEL -> set_level(debug)
end,
LogColored = rebar_config:get_global(Config, log_colored, true),
set_log_colored(LogColored).
end.
set_level(Level) ->
erlang:put(rebar_log_level, Level).
set_log_colored(true) ->
erlang:put(rebar_log_colored, true);
set_log_colored(_LogColored) ->
erlang:put(rebar_log_colored, false).
ok = application:set_env(rebar, log_level, Level).
log(Level, Str, Args) ->
log(standard_io, Level, Str, Args).
log(Device, Level, Str, Args) ->
LogLevel = erlang:get(rebar_log_level),
LogColored = erlang:get(rebar_log_colored),
{ok, LogLevel} = application:get_env(rebar, log_level),
case should_log(LogLevel, Level) of
true ->
io:format(Device, log_prefix(Level, LogColored) ++ Str, Args);
io:format(Device, log_prefix(Level) ++ Str, Args);
false ->
ok
end.
@ -99,33 +90,7 @@ should_log(error, error) -> true;
should_log(error, _) -> false;
should_log(_, _) -> false.
log_prefix(Level, _Colored = false) ->
log_prefix(Level);
log_prefix(Level, _Colored = true) ->
color_from_level(Level) ++ log_prefix(Level) ++ reset_color().
log_prefix(debug) -> "DEBUG: ";
log_prefix(info) -> "INFO: ";
log_prefix(warn) -> "WARN: ";
log_prefix(error) -> "ERROR: ".
color_from_level(debug) ->
color_foreground(blue);
color_from_level(info) ->
color_foreground(green);
color_from_level(warn) ->
color_foreground(yellow);
color_from_level(error) ->
color_bold() ++ color_foreground(red).
color_foreground(black) -> "\e[30m";
color_foreground(red) -> "\e[31m";
color_foreground(green) -> "\e[32m";
color_foreground(yellow) -> "\e[33m";
color_foreground(blue) -> "\e[34m";
color_foreground(magenta) -> "\e[35m";
color_foreground(cyan) -> "\e[36m";
color_foreground(white) -> "\e[37m".
color_bold() -> "\e[1m".
reset_color() -> "\e[0m".