diff options
author | Michael Klishin <michael@rabbitmq.com> | 2014-07-01 10:32:11 +0400 |
---|---|---|
committer | Michael Klishin <michael@rabbitmq.com> | 2014-07-01 10:32:11 +0400 |
commit | ca8807ce9dbc9a01607cfdfdb9d5c5a434f37551 (patch) | |
tree | ce1762e13dfd475c4a47ba68b06ef52b4a3fe1f0 /src/rabbit_control_main.erl | |
parent | bc1ddef59d631a754a9b995623f9b685abe0ec29 (diff) | |
download | rabbitmq-server-git-ca8807ce9dbc9a01607cfdfdb9d5c5a434f37551.tar.gz |
Use rabbit:is_running/1
Diffstat (limited to 'src/rabbit_control_main.erl')
-rw-r--r-- | src/rabbit_control_main.erl | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 0038122423..645ac991f1 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -732,20 +732,15 @@ unsafe_rpc(Node, Mod, Fun, Args) -> end. ensure_app_running(Node) -> - case rpc:call(Node, application, which_applications, [5000]) of - {badrpc, Reason} -> - fail_on_badrpc(Node, Reason); - Apps -> - case proplists:is_defined(rabbit, Apps) of - true -> - ok; - false -> - fmt_stderr("rabbit app is not running on node ~s, " - "please start it with rabbitmqctl start_app " - "and try again", - [Node]), - rabbit_misc:quit(2) - end + case rabbit:is_running(Node) of + true -> + ok; + false -> + fmt_stderr("rabbit app is not running on node ~s, " + "please start it with rabbitmqctl start_app " + "and try again", + [Node]), + rabbit_misc:quit(2) end. call(Node, {Mod, Fun, Args}) -> |