diff options
author | Michael Klishin <michael@rabbitmq.com> | 2014-06-29 22:12:44 +0400 |
---|---|---|
committer | Michael Klishin <michael@rabbitmq.com> | 2014-06-29 22:12:44 +0400 |
commit | bafc5105101443fa465c5543eaf861a4cec18276 (patch) | |
tree | a2988244ffee240e3e5e387851329958131d42ba | |
parent | fa74324d5d317b331cce88064fa56ab05848b3f1 (diff) | |
download | rabbitmq-server-bafc5105101443fa465c5543eaf861a4cec18276.tar.gz |
Use rabbit:is_running/1 here
-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 0d0e71a5..1b36f73a 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -733,20 +733,15 @@ unsafe_rpc(Node, Mod, Fun, Args) -> end. quit_if_rabbit_app_is_not_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}) -> |