yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(nodetool): add path from RELEASES file

This commit is contained in:
Zaiming Shi 2021-05-13 06:58:08 +02:00 committed by JianBo He
parent 9c244679dc
commit 53291ac3ff
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bin/nodetool
View File

@ -296,11 +296,30 @@ add_libs_dir() ->
os:getenv("REL_VSN"), os:getenv("REL_VSN"),
"emqx.rel" "emqx.rel"
]), ]),
{ok, [{release, {_, _RelVsn}, {erts, _ErtsVsn}, Libs}]} = file:consult(RelFile), case file:consult(RelFile) of
{ok, [{release, {_, _RelVsn}, {erts, _ErtsVsn}, Libs}]} ->
lists:foreach( lists:foreach(
fun({Name, Vsn}) -> add_lib_dir(RootDir, Name, Vsn); fun({Name, Vsn}) -> add_lib_dir(RootDir, Name, Vsn);
({Name, Vsn, _}) -> add_lib_dir(RootDir, Name, Vsn) ({Name, Vsn, _}) -> add_lib_dir(RootDir, Name, Vsn)
end, Libs). end, Libs);
{error, enoent} ->
%% rel file is deleted by release handler
add_libs_dir2(RootDir)
end.
add_libs_dir2(RootDir) ->
RelFile = filename:join([RootDir, "releases", "RELEASES"]),
case file:consult(RelFile) of
{ok, [[Release]]} ->
{release, _Name, _AppVsn, _ErtsVsn, Libs, _State} = Release,
lists:foreach(
fun({Name, Vsn, _}) ->
add_lib_dir(RootDir, Name, Vsn)
end, Libs);
{error, Reason} ->
%% rel file was been deleted by release handler
error({failed_to_read_RELEASES_file, RelFile, Reason})
end.
add_lib_dir(RootDir, Name, Vsn) -> add_lib_dir(RootDir, Name, Vsn) ->
LibDir = filename:join([RootDir, lib, atom_to_list(Name) ++ "-" ++ Vsn, ebin]), LibDir = filename:join([RootDir, lib, atom_to_list(Name) ++ "-" ++ Vsn, ebin]),