From 93e5bdb9e642fde17ca330d32cebe7d531b657b2 Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Sun, 5 Jan 2020 23:05:51 +0900 Subject: [PATCH] Make zx_daemon:idle/0 safe to call in all cases. --- zomp/lib/otpr/zx/0.5.9/src/zx.erl | 12 ++++++++---- zomp/lib/otpr/zx/0.5.9/src/zx_daemon.erl | 5 ++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/zomp/lib/otpr/zx/0.5.9/src/zx.erl b/zomp/lib/otpr/zx/0.5.9/src/zx.erl index 9573507..331a1a0 100644 --- a/zomp/lib/otpr/zx/0.5.9/src/zx.erl +++ b/zomp/lib/otpr/zx/0.5.9/src/zx.erl @@ -372,11 +372,15 @@ start() -> Error -> done(Error) end; ["rundir", Path | _] -> - {ok, #{package_id := PackageID}} = zx_lib:read_project_meta(Path), - zx_lib:new_logpath(PackageID); + case zx_lib:read_project_meta(Path) of + {ok, #{package_id := PackageID}} -> zx_lib:new_logpath(PackageID); + Error -> done(Error) + end; ["runlocal" | _] -> - {ok, #{package_id := PackageID}} = zx_lib:read_project_meta(), - zx_lib:new_logpath(PackageID); + case zx_lib:read_project_meta() of + {ok, #{package_id := PackageID}} -> zx_lib:new_logpath(PackageID); + Error -> done(Error) + end; _ -> {ok, Version} = zx_lib:string_to_version(os:getenv("ZX_VERSION")), zx_lib:new_logpath({"otpr", "zx", Version}) diff --git a/zomp/lib/otpr/zx/0.5.9/src/zx_daemon.erl b/zomp/lib/otpr/zx/0.5.9/src/zx_daemon.erl index 5ac517d..0942607 100644 --- a/zomp/lib/otpr/zx/0.5.9/src/zx_daemon.erl +++ b/zomp/lib/otpr/zx/0.5.9/src/zx_daemon.erl @@ -790,7 +790,10 @@ conf(Attribute, Value) -> %%% (pre) Shutdown idle() -> - gen_server:call(?MODULE, idle). + case whereis(?MODULE) of + undefined -> ok; + Daemon -> gen_server:call(Daemon, idle) + end.