diff options
| author | Jordan Wilberding <[email protected]> | 2013-10-15 06:51:14 -0700 |
|---|---|---|
| committer | Jordan Wilberding <[email protected]> | 2013-10-15 06:51:14 -0700 |
| commit | b6c988c9e00d3b006840f46d874539b776d183b5 (patch) | |
| tree | b3ad4696c6525178008dfd6979963b5aaeb36c58 /src/rlx_app_discovery.erl | |
| parent | d8fe19483d1afe15017709058f330ac132e4029a (diff) | |
| parent | 383a1687d8850c20a7a5d7ff6c0cd1a5753170b3 (diff) | |
| download | relx-b6c988c9e00d3b006840f46d874539b776d183b5.tar.gz relx-b6c988c9e00d3b006840f46d874539b776d183b5.tar.bz2 relx-b6c988c9e00d3b006840f46d874539b776d183b5.zip | |
Merge pull request #69 from ericbmerritt/remove_custom_logger
Remove custom logger
Diffstat (limited to 'src/rlx_app_discovery.erl')
| -rw-r--r-- | src/rlx_app_discovery.erl | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/rlx_app_discovery.erl b/src/rlx_app_discovery.erl index 515e6ae..aaa6e86 100644 --- a/src/rlx_app_discovery.erl +++ b/src/rlx_app_discovery.erl @@ -37,11 +37,11 @@ %% looking for OTP Applications -spec do(rlx_state:t(), [file:name()]) -> {ok, [rlx_app_info:t()]} | relx:error(). do(State, LibDirs) -> - rlx_log:info(rlx_state:log(State), - fun() -> - ["Resolving OTP Applications from directories:\n", - string:join([[rlx_util:indent(2), LibDir] || LibDir <- LibDirs], "\n")] - end), + ec_cmd_log:info(rlx_state:log(State), + fun() -> + ["Resolving OTP Applications from directories:\n", + string:join([[rlx_util:indent(2), LibDir] || LibDir <- LibDirs], "\n")] + end), resolve_app_metadata(State, LibDirs). -spec format_error([ErrorDetail::term()]) -> iolist(). @@ -58,25 +58,25 @@ resolve_app_metadata(State, LibDirs) -> {error, Ret} -> Ret end - || Err <- AppMeta0, - case Err of - {error, _} -> - true; - {warning, W} -> - rlx_log:warn(rlx_state:log(State), format_detail(W)), - false; - _ -> - false - end] of + || Err <- AppMeta0, + case Err of + {error, _} -> + true; + {warning, W} -> + ec_cmd_log:warn(rlx_state:log(State), format_detail(W)), + false; + _ -> + false + end] of [] -> SkipApps = rlx_state:skip_apps(State), AppMeta1 = [App || {ok, App} <- setup_overrides(State, AppMeta0), not lists:keymember(rlx_app_info:name(App), 1, SkipApps)], - rlx_log:debug(rlx_state:log(State), - fun() -> - ["Resolved the following OTP Applications from the system: \n", - [[rlx_app_info:format(2, App), "\n"] || App <- AppMeta1]] - end), + ec_cmd_log:debug(rlx_state:log(State), + fun() -> + ["Resolved the following OTP Applications from the system: \n", + [[rlx_app_info:format(2, App), "\n"] || App <- AppMeta1]] + end), {ok, AppMeta1}; Errors -> ?RLX_ERROR(Errors) |