diff options
Diffstat (limited to 'src/rabbit_control.erl')
| -rw-r--r-- | src/rabbit_control.erl | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 6b9faf9b..1163ae9d 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -360,7 +360,7 @@ wait_for_application(Node, PidFile, Inform) -> wait_for_application(Node, Pid) -> case process_up(Pid) of - true -> case node_up(Node) of + true -> case rabbit:is_running(Node) of true -> ok; false -> timer:sleep(1000), wait_for_application(Node, Pid) @@ -376,12 +376,6 @@ wait_and_read_pid_file(PidFile) -> {error, _} = E -> exit({error, {could_not_read_pid, E}}) end. -node_up(Node) -> - case rpc_call(Node, application, which_applications, [infinity]) of - {badrpc, _} -> false; - Apps -> proplists:is_defined(rabbit, Apps) - end. - % Test using some OS clunkiness since we shouldn't trust % rpc:call(os, getpid, []) at this point process_up(Pid) -> |