pharpend/zx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make zx_daemon:idle/0 safe to call in all cases.

Browse Source
This commit is contained in:
Craig Everett 2020-01-05 23:05:51 +09:00
parent ebc870d1ed
commit 93e5bdb9e6
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zomp/lib/otpr/zx/0.5.9/src/zx.erl
View File

@ -372,11 +372,15 @@ start() ->
Error -> done(Error) Error -> done(Error)
end; end;
["rundir", Path | _] -> ["rundir", Path | _] ->
{ok, #{package_id := PackageID}} = zx_lib:read_project_meta(Path), case zx_lib:read_project_meta(Path) of
zx_lib:new_logpath(PackageID); {ok, #{package_id := PackageID}} -> zx_lib:new_logpath(PackageID);
Error -> done(Error)
end;
["runlocal" | _] -> ["runlocal" | _] ->
{ok, #{package_id := PackageID}} = zx_lib:read_project_meta(), case zx_lib:read_project_meta() of
zx_lib:new_logpath(PackageID); {ok, #{package_id := PackageID}} -> zx_lib:new_logpath(PackageID);
Error -> done(Error)
end;
_ -> _ ->
{ok, Version} = zx_lib:string_to_version(os:getenv("ZX_VERSION")), {ok, Version} = zx_lib:string_to_version(os:getenv("ZX_VERSION")),
zx_lib:new_logpath({"otpr", "zx", Version}) zx_lib:new_logpath({"otpr", "zx", Version})

5
zomp/lib/otpr/zx/0.5.9/src/zx_daemon.erl
View File

@ -790,7 +790,10 @@ conf(Attribute, Value) ->
%%% (pre) Shutdown %%% (pre) Shutdown
idle() -> idle() ->
gen_server:call(?MODULE, idle). case whereis(?MODULE) of
undefined -> ok;
Daemon -> gen_server:call(Daemon, idle)
end.