summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-05-23 14:07:28 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-05-23 14:07:28 +0100
commit9493ee0cdbeb7aaf994426549672ea43e915cdaa (patch)
tree4f923f6a2b7555db9614a78bc2f926eaf27a32b1 /src
parent34a57de65caac9c4a0f358111c85ca9578bef9a4 (diff)
downloadrabbitmq-server-git-9493ee0cdbeb7aaf994426549672ea43e915cdaa.tar.gz
OK, it's slightly cheeky to pass this as the name of an application. But I think it's better than passing 'rabbit' and having that not mean the 'rabbit' application.
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_control_main.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
index dd98b2f21f..124fa0f900 100644
--- a/src/rabbit_control_main.erl
+++ b/src/rabbit_control_main.erl
@@ -194,7 +194,7 @@ action(force_cluster, Node, ClusterNodeSs, _Opts, Inform) ->
action(wait, Node, [PidFile], _Opts, Inform) ->
Inform("Waiting for ~p", [Node]),
- wait_for_application(Node, PidFile, rabbit, Inform);
+ wait_for_application(Node, PidFile, rabbit_and_plugins, Inform);
action(wait, Node, [PidFile, App], _Opts, Inform) ->
Inform("Waiting for ~p on ~p", [App, Node]),
@@ -407,7 +407,7 @@ wait_for_application(Node, PidFile, Application, Inform) ->
Inform("pid is ~s", [Pid]),
wait_for_application(Node, Pid, Application).
-wait_for_application(Node, Pid, rabbit) ->
+wait_for_application(Node, Pid, rabbit_and_plugins) ->
wait_for_startup(Node, Pid);
wait_for_application(Node, Pid, Application) ->
while_process_is_alive(