aboutsummaryrefslogtreecommitdiffstats
path: root/src/rlx_prv_overlay.erl
diff options
context:
space:
mode:
authorJordan Wilberding <[email protected]>2013-10-15 06:51:14 -0700
committerJordan Wilberding <[email protected]>2013-10-15 06:51:14 -0700
commitb6c988c9e00d3b006840f46d874539b776d183b5 (patch)
treeb3ad4696c6525178008dfd6979963b5aaeb36c58 /src/rlx_prv_overlay.erl
parentd8fe19483d1afe15017709058f330ac132e4029a (diff)
parent383a1687d8850c20a7a5d7ff6c0cd1a5753170b3 (diff)
downloadrelx-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_prv_overlay.erl')
-rw-r--r--src/rlx_prv_overlay.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rlx_prv_overlay.erl b/src/rlx_prv_overlay.erl
index cd1fe33..a749ce5 100644
--- a/src/rlx_prv_overlay.erl
+++ b/src/rlx_prv_overlay.erl
@@ -132,14 +132,14 @@ merge_overlay_vars(State, FileNames) ->
{ok, Terms} ->
lists:ukeymerge(1, lists:ukeysort(1, Terms), Acc);
{error, Reason} ->
- rlx_log:warn(rlx_state:log(State),
- format_error({unable_to_read_varsfile, FileName, Reason})),
+ ec_cmd_log:warn(rlx_state:log(State),
+ format_error({unable_to_read_varsfile, FileName, Reason})),
Acc
end
end, [], FileNames).
-spec render_overlay_vars(proplists:proplist(), proplists:proplist(),
- proplists:proplist()) ->
+ proplists:proplist()) ->
{ok, proplists:proplist()} | relx:error().
render_overlay_vars(OverlayVars, [{Key, Value} | Rest], Acc)
when erlang:is_list(Value) ->
@@ -202,7 +202,7 @@ generate_app_vars(App) ->
-spec generate_state_vars(rlx_state:t()) -> proplists:proplist().
generate_state_vars(State) ->
- [{log, rlx_log:format(rlx_state:log(State))},
+ [{log, ec_cmd_log:format(rlx_state:log(State))},
{output_dir, rlx_state:output_dir(State)},
{target_dir, rlx_state:output_dir(State)},
{overridden, [AppName || {AppName, _} <- rlx_state:overrides(State)]},