diff options
author | Jordan Wilberding <[email protected]> | 2014-11-06 09:21:41 -0800 |
---|---|---|
committer | Jordan Wilberding <[email protected]> | 2014-11-06 09:21:41 -0800 |
commit | 75b44fa44ef70e078dd450bf68bfaea4d48bf4e3 (patch) | |
tree | c91e2cb7d92232a7f216e1c8b19eadba3aacd17b /src/rlx_config.erl | |
parent | 655b54a45c5d1a2e319841408c0b5431ea0cd9e2 (diff) | |
parent | 79bbf33cbd46c9a1beeae00424e14969608385ba (diff) | |
download | relx-75b44fa44ef70e078dd450bf68bfaea4d48bf4e3.tar.gz relx-75b44fa44ef70e078dd450bf68bfaea4d48bf4e3.tar.bz2 relx-75b44fa44ef70e078dd450bf68bfaea4d48bf4e3.zip |
Merge pull request #252 from tsloughter/master
Split app and release discovery and format_error fix
Diffstat (limited to 'src/rlx_config.erl')
-rw-r--r-- | src/rlx_config.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rlx_config.erl b/src/rlx_config.erl index c838c18..307d2b6 100644 --- a/src/rlx_config.erl +++ b/src/rlx_config.erl @@ -25,7 +25,7 @@ %% API -export([do/1, - format_error/1]). + format_error/2]). -include("relx.hrl"). @@ -46,11 +46,11 @@ do(State) -> load_config(ConfigFile, State) end. --spec format_error(Reason::term()) -> iolist(). -format_error({consult, ConfigFile, Reason}) -> +-spec format_error(Reason::term(), rlx_state:t()) -> iolist(). +format_error({consult, ConfigFile, Reason}, _) -> io_lib:format("Unable to read file ~s: ~s", [ConfigFile, file:format_error(Reason)]); -format_error({invalid_term, Term}) -> +format_error({invalid_term, Term}, _) -> io_lib:format("Invalid term in config file: ~p", [Term]). %%%=================================================================== |