Merge bug 24792

16 files changed, 662 insertions, 636 deletions

diff --git a/scripts/rabbitmq-plugins b/scripts/rabbitmq-plugins
index 14a18d57..97c74791 100755
--- a/scripts/rabbitmq-plugins
+++ b/scripts/rabbitmq-plugins
@@ -31,7 +31,7 @@ exec erl \
     -noinput \
     -hidden \
     -sname rabbitmq-plugins$$ \
-    -s rabbit_plugins \
+    -s rabbit_plugins_main \
     -enabled_plugins_file "$RABBITMQ_ENABLED_PLUGINS_FILE" \
     -plugins_dist_dir "$RABBITMQ_PLUGINS_DIR" \
     -extra "$@"
diff --git a/scripts/rabbitmq-plugins.bat b/scripts/rabbitmq-plugins.bat
index 66a900a1..bc198393 100755
--- a/scripts/rabbitmq-plugins.bat
+++ b/scripts/rabbitmq-plugins.bat
@@ -45,7 +45,7 @@ if "!RABBITMQ_ENABLED_PLUGINS_FILE!"=="" (
 

 set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins

 

-"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden -sname rabbitmq-plugins!RANDOM! -s rabbit_plugins -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -extra !STAR!

+"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden -sname rabbitmq-plugins!RANDOM! -s rabbit_plugins_main -enabled_plugins_file "!RABBITMQ_ENABLED_PLUGINS_FILE!" -plugins_dist_dir "!RABBITMQ_PLUGINS_DIR:\=/!" -extra !STAR!

 

 endlocal

 endlocal

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 0a5a4640..81a5e572 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -58,7 +58,8 @@ DEFAULT_NODE_PORT=5672
 ##--- End of overridden <var_name> variables
 
 RABBITMQ_START_RABBIT=
-[ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput'
+[ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT=" -noinput"
+[ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="$RABBITMQ_START_RABBIT -s rabbit boot "
 
 case "$(uname -s)" in
   CYGWIN*) # we make no attempt to record the cygwin pid; rabbitmqctl wait
@@ -70,24 +71,17 @@ case "$(uname -s)" in
 esac
 
 RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
-if [ "x" = "x$RABBITMQ_NODE_ONLY" ]; then
-    if erl \
-	-pa "$RABBITMQ_EBIN_ROOT" \
-	-noinput \
-	-hidden \
-	-s rabbit_prelaunch \
-	-sname rabbitmqprelaunch$$ \
-	-extra "$RABBITMQ_ENABLED_PLUGINS_FILE" "$RABBITMQ_PLUGINS_DIR" "${RABBITMQ_PLUGINS_EXPAND_DIR}" "${RABBITMQ_NODENAME}"
+if ! `erl \
+        -pa "$RABBITMQ_EBIN_ROOT" \
+	    -noinput \
+	    -hidden \
+	    -s rabbit_prelaunch \
+	    -sname rabbitmqprelaunch$$ \
+	    -extra "${RABBITMQ_NODENAME}"`;
     then
-	RABBITMQ_BOOT_FILE="${RABBITMQ_PLUGINS_EXPAND_DIR}/rabbit"
-	RABBITMQ_EBIN_PATH=""
-    else
-	exit 1
-    fi
-else
-    RABBITMQ_BOOT_FILE=start_sasl
-    RABBITMQ_EBIN_PATH="-pa ${RABBITMQ_EBIN_ROOT}"
+        exit 1;
 fi
+
 RABBITMQ_CONFIG_ARG=
 [ -f "${RABBITMQ_CONFIG_FILE}.config" ] && RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}"
 
@@ -100,10 +94,10 @@ RABBITMQ_LISTEN_ARG=
 set -f
 
 exec erl \
-    ${RABBITMQ_EBIN_PATH} \
+    -pa ${RABBITMQ_EBIN_ROOT} \
     ${RABBITMQ_START_RABBIT} \
     -sname ${RABBITMQ_NODENAME} \
-    -boot ${RABBITMQ_BOOT_FILE} \
+    -boot start_sasl \
     ${RABBITMQ_CONFIG_ARG} \
     +W w \
     ${RABBITMQ_SERVER_ERL_ARGS} \
@@ -112,6 +106,9 @@ exec erl \
     -sasl sasl_error_logger false \
     -rabbit error_logger '{file,"'${RABBITMQ_LOGS}'"}' \
     -rabbit sasl_error_logger '{file,"'${RABBITMQ_SASL_LOGS}'"}' \
+    -rabbit enabled_plugins_file "\"$RABBITMQ_ENABLED_PLUGINS_FILE\"" \
+    -rabbit plugins_dir "\"$RABBITMQ_PLUGINS_DIR\"" \
+    -rabbit plugins_expand_dir "\"$RABBITMQ_PLUGINS_EXPAND_DIR\"" \
     -os_mon start_cpu_sup false \
     -os_mon start_disksup false \
     -os_mon start_memsup false \
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index ca49a5d8..09d4661f 100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -90,21 +90,17 @@ set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins
 set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin

 

 "!ERLANG_HOME!\bin\erl.exe" ^

--pa "!RABBITMQ_EBIN_ROOT!" ^

--noinput -hidden ^

--s rabbit_prelaunch ^

--sname rabbitmqprelaunch!RANDOM! ^

--extra "!RABBITMQ_ENABLED_PLUGINS_FILE:\=/!" ^

-       "!RABBITMQ_PLUGINS_DIR:\=/!" ^

-       "!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!" ^

-       "!RABBITMQ_NODENAME!"

-

-set RABBITMQ_BOOT_FILE=!RABBITMQ_PLUGINS_EXPAND_DIR!\rabbit

+        -pa "!RABBITMQ_EBIN_ROOT!" ^

+        -noinput -hidden ^

+        -s rabbit_prelaunch ^

+        -sname rabbitmqprelaunch!RANDOM! ^

+        -extra "!RABBITMQ_NODENAME!"

+

 if ERRORLEVEL 1 (

     exit /B 1

 )

 

-set RABBITMQ_EBIN_PATH=

+set RABBITMQ_EBIN_PATH="-pa !RABBITMQ_EBIN_ROOT!"

 

 if "!RABBITMQ_CONFIG_FILE!"=="" (

     set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq

@@ -124,9 +120,10 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
 )

 

 "!ERLANG_HOME!\bin\erl.exe" ^

-!RABBITMQ_EBIN_PATH! ^

+-pa "!RABBITMQ_EBIN_ROOT!" ^

 -noinput ^

--boot "!RABBITMQ_BOOT_FILE!" ^

+-boot start_sasl ^

+-s rabbit boot ^

 !RABBITMQ_CONFIG_ARG! ^

 -sname !RABBITMQ_NODENAME! ^

 +W w ^

@@ -139,6 +136,9 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
 -sasl sasl_error_logger false ^

 -rabbit error_logger {file,\""!LOGS:\=/!"\"} ^

 -rabbit sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^

+-rabbit enabled_plugins_file \""!RABBITMQ_ENABLED_PLUGINS_FILE:\=/!"\" ^

+-rabbit plugins_dir \""!RABBITMQ_PLUGINS_DIR:\=/!"\" ^

+-rabbit plugins_expand_dir \""!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!"\" ^

 -os_mon start_cpu_sup false ^

 -os_mon start_disksup false ^

 -os_mon start_memsup false ^

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 9e274840..849bedcf 100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -157,22 +157,6 @@ if "!RABBITMQ_ENABLED_PLUGINS_FILE!"=="" (
 set RABBITMQ_PLUGINS_DIR=!TDP0!..\plugins

 set RABBITMQ_EBIN_ROOT=!TDP0!..\ebin

 

-"!ERLANG_HOME!\bin\erl.exe" ^

--pa "!RABBITMQ_EBIN_ROOT!" ^

--noinput -hidden ^

--s rabbit_prelaunch ^

--extra "!RABBITMQ_ENABLED_PLUGINS_FILE:\=/!" ^

-       "!RABBITMQ_PLUGINS_DIR:\=/!" ^

-       "!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!" ^

-       ""

-

-set RABBITMQ_BOOT_FILE=!RABBITMQ_PLUGINS_EXPAND_DIR!\rabbit

-if ERRORLEVEL 1 (

-    exit /B 1

-)

-

-set RABBITMQ_EBIN_PATH=

-

 if "!RABBITMQ_CONFIG_FILE!"=="" (

     set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq

 )

@@ -191,8 +175,9 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
 )

 

 set ERLANG_SERVICE_ARGUMENTS= ^

-!RABBITMQ_EBIN_PATH! ^

--boot "!RABBITMQ_BOOT_FILE!" ^

+-pa "!RABBITMQ_EBIN_ROOT!" ^

+-boot start_sasl ^

+-s rabbit boot ^

 !RABBITMQ_CONFIG_ARG! ^

 +W w ^

 +A30 ^

@@ -204,6 +189,9 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 -sasl sasl_error_logger false ^

 -rabbit error_logger {file,\""!LOGS:\=/!"\"} ^

 -rabbit sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^

+-rabbit enabled_plugins_file \""!RABBITMQ_ENABLED_PLUGINS_FILE:\=/!"\" ^

+-rabbit plugins_dir \""!RABBITMQ_PLUGINS_DIR:\=/!"\" ^

+-rabbit plugins_expand_dir \""!RABBITMQ_PLUGINS_EXPAND_DIR:\=/!"\" ^

 -os_mon start_cpu_sup false ^

 -os_mon start_disksup false ^

 -os_mon start_memsup false ^

diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index 4aad6b8f..a5fade72 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -32,6 +32,6 @@ exec erl \
     -hidden \
     ${RABBITMQ_CTL_ERL_ARGS} \
     -sname rabbitmqctl$$ \
-    -s rabbit_control \
+    -s rabbit_control_main \
     -nodename $RABBITMQ_NODENAME \
     -extra "$@"
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index f37fae48..9f549f1e 100755
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -34,7 +34,7 @@ if "!RABBITMQ_NODENAME!"=="" (
 if not exist "!ERLANG_HOME!\bin\erl.exe" (

     echo.

     echo ******************************

-    echo ERLANG_HOME not set correctly. 

+    echo ERLANG_HOME not set correctly.

     echo ******************************

     echo.

     echo Please either set ERLANG_HOME to point to your Erlang installation or place the

@@ -43,7 +43,7 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
     exit /B

 )

 

-"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden !RABBITMQ_CTL_ERL_ARGS! -sname rabbitmqctl!RANDOM! -s rabbit_control -nodename !RABBITMQ_NODENAME! -extra !STAR!

+"!ERLANG_HOME!\bin\erl.exe" -pa "!TDP0!..\ebin" -noinput -hidden !RABBITMQ_CTL_ERL_ARGS! -sname rabbitmqctl!RANDOM! -s rabbit_control_main -nodename !RABBITMQ_NODENAME! -extra !STAR!

 

 endlocal

 endlocal

diff --git a/src/app_utils.erl b/src/app_utils.erl
new file mode 100644
index 00000000..4bef83a5
--- /dev/null
+++ b/src/app_utils.erl
@@ -0,0 +1,121 @@
+%% The contents of this file are subject to the Mozilla Public License
+%% Version 1.1 (the "License"); you may not use this file except in
+%% compliance with the License. You may obtain a copy of the License
+%% at http://www.mozilla.org/MPL/
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and
+%% limitations under the License.
+%%
+%% The Original Code is RabbitMQ.
+%%
+%% The Initial Developer of the Original Code is VMware, Inc.
+%% Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
+%%
+-module(app_utils).
+
+-export([load_applications/1, start_applications/1,
+         stop_applications/1, app_dependency_order/2,
+         wait_for_applications/1]).
+
+-ifdef(use_specs).
+
+-spec load_applications([atom()])               -> 'ok'.
+-spec start_applications([atom()])              -> 'ok'.
+-spec stop_applications([atom()])               -> 'ok'.
+-spec wait_for_applications([atom()])           -> 'ok'.
+-spec app_dependency_order([atom()], boolean()) -> [digraph:vertex()].
+
+-endif.
+
+%%---------------------------------------------------------------------------
+%% Public API
+
+load_applications(Apps) ->
+    load_applications(queue:from_list(Apps), sets:new()),
+    ok.
+
+start_applications(Apps) ->
+    manage_applications(fun lists:foldl/3,
+                        fun application:start/1,
+                        fun application:stop/1,
+                        already_started,
+                        cannot_start_application,
+                        Apps).
+
+stop_applications(Apps) ->
+    manage_applications(fun lists:foldr/3,
+                        fun application:stop/1,
+                        fun application:start/1,
+                        not_started,
+                        cannot_stop_application,
+                        Apps).
+
+wait_for_applications(Apps) ->
+    [wait_for_application(App) || App <- Apps], ok.
+
+app_dependency_order(RootApps, StripUnreachable) ->
+    {ok, G} = rabbit_misc:build_acyclic_graph(
+                fun (App, _Deps) -> [{App, App}] end,
+                fun (App,  Deps) -> [{Dep, App} || Dep <- Deps] end,
+                [{App, app_dependencies(App)} ||
+                    {App, _Desc, _Vsn} <- application:loaded_applications()]),
+    try
+        case StripUnreachable of
+            true -> digraph:del_vertices(G, digraph:vertices(G) --
+                     digraph_utils:reachable(RootApps, G));
+            false -> ok
+        end,
+        digraph_utils:topsort(G)
+    after
+        true = digraph:delete(G)
+    end.
+
+%%---------------------------------------------------------------------------
+%% Private API
+
+wait_for_application(Application) ->
+    case lists:keymember(Application, 1, application:which_applications()) of
+         true  -> ok;
+         false -> timer:sleep(1000),
+                  wait_for_application(Application)
+    end.
+
+load_applications(Worklist, Loaded) ->
+    case queue:out(Worklist) of
+        {empty, _WorkList} ->
+            ok;
+        {{value, App}, Worklist1} ->
+            case sets:is_element(App, Loaded) of
+                true  -> load_applications(Worklist1, Loaded);
+                false -> case application:load(App) of
+                             ok                             -> ok;
+                             {error, {already_loaded, App}} -> ok;
+                             Error                          -> throw(Error)
+                         end,
+                         load_applications(
+                           queue:join(Worklist1,
+                                      queue:from_list(app_dependencies(App))),
+                           sets:add_element(App, Loaded))
+            end
+    end.
+
+app_dependencies(App) ->
+    case application:get_key(App, applications) of
+        undefined -> [];
+        {ok, Lst} -> Lst
+    end.
+
+manage_applications(Iterate, Do, Undo, SkipError, ErrorTag, Apps) ->
+    Iterate(fun (App, Acc) ->
+                    case Do(App) of
+                        ok -> [App | Acc];
+                        {error, {SkipError, _}} -> Acc;
+                        {error, Reason} ->
+                            lists:foreach(Undo, Acc),
+                            throw({error, {ErrorTag, App, Reason}})
+                    end
+            end, [], Apps),
+    ok.
+
diff --git a/src/rabbit.erl b/src/rabbit.erl
index df009529..f69c8d1b 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -18,9 +18,9 @@
 
 -behaviour(application).
 
--export([maybe_hipe_compile/0, prepare/0, start/0, stop/0, stop_and_halt/0,
-         status/0, is_running/0, is_running/1, environment/0,
-         rotate_logs/1, force_event_refresh/0]).
+-export([maybe_hipe_compile/0, prepare/0, start/0, boot/0, stop/0,
+         stop_and_halt/0, await_startup/0, status/0, is_running/0,
+         is_running/1, environment/0, rotate_logs/1, force_event_refresh/0]).
 
 -export([start/2, stop/1]).
 
@@ -219,8 +219,10 @@
 -spec(maybe_hipe_compile/0 :: () -> 'ok').
 -spec(prepare/0 :: () -> 'ok').
 -spec(start/0 :: () -> 'ok').
+-spec(boot/0 :: () -> 'ok').
 -spec(stop/0 :: () -> 'ok').
 -spec(stop_and_halt/0 :: () -> no_return()).
+-spec(await_startup/0 :: () -> 'ok').
 -spec(status/0 ::
         () -> [{pid, integer()} |
                {running_applications, [{atom(), string(), string()}]} |
@@ -286,28 +288,46 @@ split0([],       Ls)       -> Ls;
 split0([I | Is], [L | Ls]) -> split0(Is, Ls ++ [[I | L]]).
 
 prepare() ->
+    %% this ends up looking at the rabbit app's env, so it
+    %% needs to be loaded, but during the tests, it may end up
+    %% getting loaded twice, so guard against that
+    case application:load(rabbit) of
+        ok                                -> ok;
+        {error, {already_loaded, rabbit}} -> ok
+    end,
     ok = ensure_working_log_handlers(),
     ok = rabbit_upgrade:maybe_upgrade_mnesia().
 
 start() ->
+    start_it(fun() ->
+                     ok = prepare(),
+                     ok = app_utils:start_applications(app_startup_order()),
+                     ok = print_plugin_info(rabbit_plugins:active())
+             end).
+
+boot() ->
+    start_it(fun() ->
+                     ok = prepare(),
+                     Plugins = rabbit_plugins:setup(),
+                     ToBeLoaded = Plugins ++ ?APPS,
+                     ok = app_utils:load_applications(ToBeLoaded),
+                     StartupApps = app_utils:app_dependency_order(ToBeLoaded,
+                                                                  false),
+                     ok = app_utils:start_applications(StartupApps),
+                     ok = print_plugin_info(Plugins)
+             end).
+
+start_it(StartFun) ->
     try
-        %% prepare/1 ends up looking at the rabbit app's env, so it
-        %% needs to be loaded, but during the tests, it may end up
-        %% getting loaded twice, so guard against that
-        case application:load(rabbit) of
-            ok                                -> ok;
-            {error, {already_loaded, rabbit}} -> ok
-        end,
-        ok = prepare(),
-        ok = rabbit_misc:start_applications(application_load_order())
+        StartFun()
     after
-        %%give the error loggers some time to catch up
+        %% give the error loggers some time to catch up
         timer:sleep(100)
     end.
 
 stop() ->
     rabbit_log:info("Stopping Rabbit~n"),
-    ok = rabbit_misc:stop_applications(application_load_order()).
+    ok = app_utils:stop_applications(app_shutdown_order()).
 
 stop_and_halt() ->
     try
@@ -318,6 +338,9 @@ stop_and_halt() ->
     end,
     ok.
 
+await_startup() ->
+    app_utils:wait_for_applications(app_startup_order()).
+
 status() ->
     S1 = [{pid,                  list_to_integer(os:getpid())},
           {running_applications, application:which_applications(infinity)},
@@ -394,46 +417,13 @@ stop(_State) ->
 %%---------------------------------------------------------------------------
 %% application life cycle
 
-application_load_order() ->
-    ok = load_applications(),
-    {ok, G} = rabbit_misc:build_acyclic_graph(
-                fun (App, _Deps) -> [{App, App}] end,
-                fun (App,  Deps) -> [{Dep, App} || Dep <- Deps] end,
-                [{App, app_dependencies(App)} ||
-                    {App, _Desc, _Vsn} <- application:loaded_applications()]),
-    true = digraph:del_vertices(
-             G, digraph:vertices(G) -- digraph_utils:reachable(?APPS, G)),
-    Result = digraph_utils:topsort(G),
-    true = digraph:delete(G),
-    Result.
-
-load_applications() ->
-    load_applications(queue:from_list(?APPS), sets:new()).
-
-load_applications(Worklist, Loaded) ->
-    case queue:out(Worklist) of
-        {empty, _WorkList} ->
-            ok;
-        {{value, App}, Worklist1} ->
-            case sets:is_element(App, Loaded) of
-                true  -> load_applications(Worklist1, Loaded);
-                false -> case application:load(App) of
-                             ok                             -> ok;
-                             {error, {already_loaded, App}} -> ok;
-                             Error                          -> throw(Error)
-                         end,
-                         load_applications(
-                           queue:join(Worklist1,
-                                      queue:from_list(app_dependencies(App))),
-                           sets:add_element(App, Loaded))
-            end
-    end.
+app_startup_order() ->
+    ok = app_utils:load_applications(?APPS),
+    app_utils:app_dependency_order(?APPS, false).
 
-app_dependencies(App) ->
-    case application:get_key(App, applications) of
-        undefined -> [];
-        {ok, Lst} -> Lst
-    end.
+app_shutdown_order() ->
+    Apps = ?APPS ++ rabbit_plugins:active(),
+    app_utils:app_dependency_order(Apps, true).
 
 %%---------------------------------------------------------------------------
 %% boot step logic
@@ -479,7 +469,8 @@ sort_boot_steps(UnsortedSteps) ->
             %% there is one, otherwise fail).
             SortedSteps = lists:reverse(
                             [begin
-                                 {StepName, Step} = digraph:vertex(G, StepName),
+                                 {StepName, Step} = digraph:vertex(G,
+                                                                   StepName),
                                  Step
                              end || StepName <- digraph_utils:topsort(G)]),
             digraph:delete(G),
@@ -561,7 +552,8 @@ insert_default_data() ->
     ok = rabbit_vhost:add(DefaultVHost),
     ok = rabbit_auth_backend_internal:add_user(DefaultUser, DefaultPass),
     ok = rabbit_auth_backend_internal:set_tags(DefaultUser, DefaultTags),
-    ok = rabbit_auth_backend_internal:set_permissions(DefaultUser, DefaultVHost,
+    ok = rabbit_auth_backend_internal:set_permissions(DefaultUser,
+                                                      DefaultVHost,
                                                       DefaultConfigurePerm,
                                                       DefaultWritePerm,
                                                       DefaultReadPerm),
@@ -649,6 +641,24 @@ force_event_refresh() ->
 %%---------------------------------------------------------------------------
 %% misc
 
+print_plugin_info([]) ->
+    ok;
+print_plugin_info(Plugins) ->
+    %% This gets invoked by rabbitmqctl start_app, outside the context
+    %% of the rabbit application
+    rabbit_misc:with_local_io(
+      fun() ->
+              io:format("~n-- plugins running~n"),
+              [print_plugin_info(
+                 AppName, element(2, application:get_key(AppName, vsn)))
+               || AppName <- Plugins],
+              ok
+      end).
+
+print_plugin_info(Plugin, Vsn) ->
+    Len = 76 - length(Vsn),
+    io:format("~-" ++ integer_to_list(Len) ++ "s ~s~n", [Plugin, Vsn]).
+
 erts_version_check() ->
     FoundVer = erlang:system_info(version),
     case rabbit_misc:version_compare(?ERTS_MINIMUM, FoundVer, lte) of
diff --git a/src/rabbit_control.erl b/src/rabbit_control_main.erl
index 0c3ac966..f8b8c345 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control_main.erl
@@ -14,7 +14,7 @@
 %% Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
 %%
 
--module(rabbit_control).
+-module(rabbit_control_main).
 -include("rabbit.hrl").
 
 -export([start/0, stop/0, action/5]).
@@ -248,7 +248,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]),
     wait_for_application(Node, PidFile, list_to_atom(App), Inform);
@@ -460,12 +460,22 @@ wait_for_application(Node, PidFile, Application, Inform) ->
     Inform("pid is ~s", [Pid]),
     wait_for_application(Node, Pid, Application).
 
+wait_for_application(Node, Pid, rabbit_and_plugins) ->
+    wait_for_startup(Node, Pid);
 wait_for_application(Node, Pid, Application) ->
+    while_process_is_alive(
+      Node, Pid, fun() -> rabbit_nodes:is_running(Node, Application) end).
+
+wait_for_startup(Node, Pid) ->
+    while_process_is_alive(
+      Node, Pid, fun() -> rpc:call(Node, rabbit, await_startup, []) =:= ok end).
+
+while_process_is_alive(Node, Pid, Activity) ->
     case process_up(Pid) of
-        true  -> case rabbit_nodes:is_running(Node, Application) of
+        true  -> case Activity() of
                      true  -> ok;
                      false -> timer:sleep(?EXTERNAL_CHECK_INTERVAL),
-                              wait_for_application(Node, Pid, Application)
+                              while_process_is_alive(Node, Pid, Activity)
                  end;
         false -> {error, process_not_running}
     end.
@@ -480,7 +490,7 @@ wait_for_process_death(Pid) ->
 read_pid_file(PidFile, Wait) ->
     case {file:read_file(PidFile), Wait} of
         {{ok, Bin}, _} ->
-            S = string:strip(binary_to_list(Bin), right, $\n),
+            S = re:replace(Bin, "\\s", "", [global, {return, list}]),
             try list_to_integer(S)
             catch error:badarg ->
                     exit({error, {garbage_in_pid_file, PidFile}})
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 93c784ec..d41aa09b 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -19,7 +19,7 @@
 -include("rabbit_framing.hrl").
 
 -export([method_record_type/1, polite_pause/0, polite_pause/1]).
--export([die/1, frame_error/2, amqp_error/4,
+-export([die/1, frame_error/2, amqp_error/4, quit/1, quit/2,
          protocol_error/3, protocol_error/4, protocol_error/1]).
 -export([not_found/1, assert_args_equivalence/4]).
 -export([dirty_read/1]).
@@ -42,7 +42,6 @@
 -export([dirty_read_all/1, dirty_foreach_key/2, dirty_dump_log/1]).
 -export([format/2, format_many/1, format_stderr/2]).
 -export([with_local_io/1, local_info_msg/2]).
--export([start_applications/1, stop_applications/1]).
 -export([unfold/2, ceil/1, queue_fold/3]).
 -export([sort_field_table/1]).
 -export([pid_to_string/1, string_to_pid/1]).
@@ -59,7 +58,6 @@
 -export([format_message_queue/2]).
 -export([append_rpc_all_nodes/4]).
 -export([multi_call/2]).
--export([quit/1]).
 -export([os_cmd/1]).
 -export([gb_sets_difference/2]).
 
@@ -87,6 +85,10 @@
 -spec(polite_pause/1 :: (non_neg_integer()) -> 'done').
 -spec(die/1 ::
         (rabbit_framing:amqp_exception()) -> channel_or_connection_exit()).
+
+-spec(quit/1 :: (integer()) -> no_return()).
+-spec(quit/2 :: (string(), [term()]) -> no_return()).
+
 -spec(frame_error/2 :: (rabbit_framing:amqp_method_name(), binary())
                        -> rabbit_types:connection_exit()).
 -spec(amqp_error/4 ::
@@ -163,8 +165,6 @@
 -spec(format_stderr/2 :: (string(), [any()]) -> 'ok').
 -spec(with_local_io/1 :: (fun (() -> A)) -> A).
 -spec(local_info_msg/2 :: (string(), [any()]) -> 'ok').
--spec(start_applications/1 :: ([atom()]) -> 'ok').
--spec(stop_applications/1 :: ([atom()]) -> 'ok').
 -spec(unfold/2  :: (fun ((A) -> ({'true', B, A} | 'false')), A) -> {[B], A}).
 -spec(ceil/1 :: (number()) -> integer()).
 -spec(queue_fold/3 :: (fun ((any(), B) -> B), B, queue()) -> B).
@@ -210,7 +210,6 @@
 -spec(append_rpc_all_nodes/4 :: ([node()], atom(), atom(), [any()]) -> [any()]).
 -spec(multi_call/2 ::
         ([pid()], any()) -> {[{pid(), any()}], [{pid(), any()}]}).
--spec(quit/1 :: (integer() | string()) -> no_return()).
 -spec(os_cmd/1 :: (string()) -> string()).
 -spec(gb_sets_difference/2 :: (gb_set(), gb_set()) -> gb_set()).
 
@@ -391,6 +390,28 @@ report_coverage_percentage(File, Cov, NotCov, Mod) ->
 confirm_to_sender(Pid, MsgSeqNos) ->
     gen_server2:cast(Pid, {confirm, MsgSeqNos, self()}).
 
+%%
+%% @doc Halts the emulator after printing out an error message io-formatted with
+%% the supplied arguments. The exit status of the beam process will be set to 1.
+%%
+quit(Fmt, Args) ->
+    io:format("ERROR: " ++ Fmt ++ "~n", Args),
+    quit(1).
+
+%%
+%% @doc Halts the emulator returning the given status code to the os.
+%% On Windows this function will block indefinitely so as to give the io
+%% subsystem time to flush stdout completely.
+%%
+quit(Status) ->
+    case os:type() of
+        {unix,  _} -> halt(Status);
+        {win32, _} -> init:stop(Status),
+                      receive
+                      after infinity -> ok
+                      end
+    end.
+
 throw_on_error(E, Thunk) ->
     case Thunk() of
         {error, Reason} -> throw({E, Reason});
@@ -593,34 +614,6 @@ with_local_io(Fun) ->
 local_info_msg(Format, Args) ->
     with_local_io(fun () -> error_logger:info_msg(Format, Args) end).
 
-manage_applications(Iterate, Do, Undo, SkipError, ErrorTag, Apps) ->
-    Iterate(fun (App, Acc) ->
-                    case Do(App) of
-                        ok -> [App | Acc];
-                        {error, {SkipError, _}} -> Acc;
-                        {error, Reason} ->
-                            lists:foreach(Undo, Acc),
-                            throw({error, {ErrorTag, App, Reason}})
-                    end
-            end, [], Apps),
-    ok.
-
-start_applications(Apps) ->
-    manage_applications(fun lists:foldl/3,
-                        fun application:start/1,
-                        fun application:stop/1,
-                        already_started,
-                        cannot_start_application,
-                        Apps).
-
-stop_applications(Apps) ->
-    manage_applications(fun lists:foldr/3,
-                        fun application:stop/1,
-                        fun application:start/1,
-                        not_started,
-                        cannot_stop_application,
-                        Apps).
-
 unfold(Fun, Init) ->
     unfold(Fun, [], Init).
 
@@ -937,13 +930,6 @@ receive_multi_call([{Mref, Pid} | MonitorPids], Good, Bad) ->
             receive_multi_call(MonitorPids, Good, [{Pid, Reason} | Bad])
     end.
 
-%% the slower shutdown on windows required to flush stdout
-quit(Status) ->
-    case os:type() of
-        {unix,  _} -> halt(Status);
-        {win32, _} -> init:stop(Status)
-    end.
-
 os_cmd(Command) ->
     Exec = hd(string:tokens(Command, " ")),
     case os:find_executable(Exec) of
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl
index 78deea97..94a5a2b7 100644
--- a/src/rabbit_networking.erl
+++ b/src/rabbit_networking.erl
@@ -142,7 +142,7 @@ start() -> rabbit_sup:start_supervisor_child(
               {rabbit_connection_sup,start_link,[]}]).
 
 ensure_ssl() ->
-    ok = rabbit_misc:start_applications([crypto, public_key, ssl]),
+    ok = app_utils:start_applications([crypto, public_key, ssl]),
     {ok, SslOptsConfig} = application:get_env(rabbit, ssl_options),
 
     % unknown_ca errors are silently ignored prior to R14B unless we
diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl
index 30c7bb37..7cf6eea9 100644
--- a/src/rabbit_plugins.erl
+++ b/src/rabbit_plugins.erl
@@ -17,13 +17,8 @@
 -module(rabbit_plugins).
 -include("rabbit.hrl").
 
--export([start/0, stop/0, find_plugins/1, read_enabled_plugins/1,
-         lookup_plugins/2, calculate_required_plugins/2, plugin_names/1]).
-
--define(VERBOSE_OPT, "-v").
--define(MINIMAL_OPT, "-m").
--define(ENABLED_OPT, "-E").
--define(ENABLED_ALL_OPT, "-e").
+-export([setup/0, active/0, read_enabled/1,
+         list/1, dependencies/3]).
 
 -define(VERBOSE_DEF, {?VERBOSE_OPT, flag}).
 -define(MINIMAL_DEF, {?MINIMAL_OPT, flag}).
@@ -41,133 +36,38 @@
 
 -ifdef(use_specs).
 
--spec(start/0 :: () -> no_return()).
--spec(stop/0 :: () -> 'ok').
--spec(find_plugins/1 :: (file:filename()) -> [#plugin{}]).
--spec(read_enabled_plugins/1 :: (file:filename()) -> [atom()]).
--spec(lookup_plugins/2 :: ([atom()], [#plugin{}]) -> [#plugin{}]).
--spec(calculate_required_plugins/2 :: ([atom()], [#plugin{}]) -> [atom()]).
--spec(plugin_names/1 :: ([#plugin{}]) -> [atom()]).
+-spec(setup/0 :: () -> [atom()]).
+-spec(active/0 :: () -> [atom()]).
+-spec(list/1 :: (string()) -> [#plugin{}]).
+-spec(read_enabled/1 :: (file:filename()) -> [atom()]).
+-spec(dependencies/3 ::
+            (boolean(), [atom()], [#plugin{}]) -> [atom()]).
 
 -endif.
 
 %%----------------------------------------------------------------------------
 
-start() ->
-    {ok, [[PluginsFile|_]|_]} =
-        init:get_argument(enabled_plugins_file),
-    {ok, [[PluginsDir|_]|_]} = init:get_argument(plugins_dist_dir),
-    {Command, Opts, Args} =
-        case rabbit_misc:parse_arguments(?COMMANDS, ?GLOBAL_DEFS,
-                                         init:get_plain_arguments())
-        of
-            {ok, Res}  -> Res;
-            no_command -> print_error("could not recognise command", []),
-                          usage()
-        end,
-
-    PrintInvalidCommandError =
-        fun () ->
-                print_error("invalid command '~s'",
-                            [string:join([atom_to_list(Command) | Args], " ")])
-        end,
-
-    case catch action(Command, Args, Opts, PluginsFile, PluginsDir) of
-        ok ->
-            rabbit_misc:quit(0);
-        {'EXIT', {function_clause, [{?MODULE, action, _} | _]}} ->
-            PrintInvalidCommandError(),
-            usage();
-        {'EXIT', {function_clause, [{?MODULE, action, _, _} | _]}} ->
-            PrintInvalidCommandError(),
-            usage();
-        {error, Reason} ->
-            print_error("~p", [Reason]),
-            rabbit_misc:quit(2);
-        {error_string, Reason} ->
-            print_error("~s", [Reason]),
-            rabbit_misc:quit(2);
-        Other ->
-            print_error("~p", [Other]),
-            rabbit_misc:quit(2)
-    end.
-
-stop() ->
-    ok.
-
-print_error(Format, Args) ->
-    rabbit_misc:format_stderr("Error: " ++ Format ++ "~n", Args).
-
-usage() ->
-    io:format("~s", [rabbit_plugins_usage:usage()]),
-    rabbit_misc:quit(1).
-
-%%----------------------------------------------------------------------------
-
-action(list, [], Opts, PluginsFile, PluginsDir) ->
-    action(list, [".*"], Opts, PluginsFile, PluginsDir);
-action(list, [Pat], Opts, PluginsFile, PluginsDir) ->
-    format_plugins(Pat, Opts, PluginsFile, PluginsDir);
-
-action(enable, ToEnable0, _Opts, PluginsFile, PluginsDir) ->
-    case ToEnable0 of
-        [] -> throw({error_string, "Not enough arguments for 'enable'"});
-        _  -> ok
-    end,
-    AllPlugins = find_plugins(PluginsDir),
-    Enabled = read_enabled_plugins(PluginsFile),
-    ImplicitlyEnabled = calculate_required_plugins(Enabled, AllPlugins),
-    ToEnable = [list_to_atom(Name) || Name <- ToEnable0],
-    Missing = ToEnable -- plugin_names(AllPlugins),
-    case Missing of
-        [] -> ok;
-        _  -> throw({error_string,
-                     fmt_list("The following plugins could not be found:",
-                              Missing)})
-    end,
-    NewEnabled = lists:usort(Enabled ++ ToEnable),
-    write_enabled_plugins(PluginsFile, NewEnabled),
-    NewImplicitlyEnabled = calculate_required_plugins(NewEnabled, AllPlugins),
-    maybe_warn_mochiweb(NewImplicitlyEnabled),
-    case NewEnabled -- ImplicitlyEnabled of
-        [] -> io:format("Plugin configuration unchanged.~n");
-        _  -> print_list("The following plugins have been enabled:",
-                         NewImplicitlyEnabled -- ImplicitlyEnabled),
-              report_change()
-    end;
-
-action(disable, ToDisable0, _Opts, PluginsFile, PluginsDir) ->
-    case ToDisable0 of
-        [] -> throw({error_string, "Not enough arguments for 'disable'"});
-        _  -> ok
-    end,
-    ToDisable = [list_to_atom(Name) || Name <- ToDisable0],
-    Enabled = read_enabled_plugins(PluginsFile),
-    AllPlugins = find_plugins(PluginsDir),
-    Missing = ToDisable -- plugin_names(AllPlugins),
-    case Missing of
-        [] -> ok;
-        _  -> print_list("Warning: the following plugins could not be found:",
-                         Missing)
-    end,
-    ToDisableDeps = calculate_dependencies(true, ToDisable, AllPlugins),
-    NewEnabled = Enabled -- ToDisableDeps,
-    case length(Enabled) =:= length(NewEnabled) of
-        true  -> io:format("Plugin configuration unchanged.~n");
-        false -> ImplicitlyEnabled =
-                     calculate_required_plugins(Enabled, AllPlugins),
-                 NewImplicitlyEnabled =
-                     calculate_required_plugins(NewEnabled, AllPlugins),
-                 print_list("The following plugins have been disabled:",
-                            ImplicitlyEnabled -- NewImplicitlyEnabled),
-                 write_enabled_plugins(PluginsFile, NewEnabled),
-                 report_change()
-    end.
-
-%%----------------------------------------------------------------------------
-
-%% Get the #plugin{}s ready to be enabled.
-find_plugins(PluginsDir) ->
+%%
+%% @doc Prepares the file system and installs all enabled plugins.
+%%
+setup() ->
+    {ok, PluginDir} = application:get_env(rabbit, plugins_dir),
+    {ok, ExpandDir} = application:get_env(rabbit, plugins_expand_dir),
+    {ok, EnabledPluginsFile} = application:get_env(rabbit,
+                                                   enabled_plugins_file),
+    prepare_plugins(EnabledPluginsFile, PluginDir, ExpandDir),
+    [prepare_dir_plugin(PluginName) ||
+            PluginName <- filelib:wildcard(ExpandDir ++ "/*/ebin/*.app")].
+
+%% @doc Lists the plugins which are currently running.
+active() ->
+    {ok, ExpandDir} = application:get_env(rabbit, plugins_expand_dir),
+    InstalledPlugins = [ P#plugin.name || P <- list(ExpandDir) ],
+    [App || {App, _, _} <- application:which_applications(),
+            lists:member(App, InstalledPlugins)].
+
+%% @doc Get the list of plugins which are ready to be enabled.
+list(PluginsDir) ->
     EZs = [{ez, EZ} || EZ <- filelib:wildcard("*.ez", PluginsDir)],
     FreeApps = [{app, App} ||
                    App <- filelib:wildcard("*/ebin/*.app", PluginsDir)],
@@ -186,6 +86,91 @@ find_plugins(PluginsDir) ->
     end,
     Plugins.
 
+%% @doc Read the list of enabled plugins from the supplied term file.
+read_enabled(PluginsFile) ->
+    case rabbit_file:read_term_file(PluginsFile) of
+        {ok, [Plugins]} -> Plugins;
+        {ok, []}        -> [];
+        {ok, [_|_]}     -> throw({error, {malformed_enabled_plugins_file,
+                                          PluginsFile}});
+        {error, enoent} -> [];
+        {error, Reason} -> throw({error, {cannot_read_enabled_plugins_file,
+                                          PluginsFile, Reason}})
+    end.
+
+%%
+%% @doc Calculate the dependency graph from <i>Sources</i>.
+%% When Reverse =:= true the bottom/leaf level applications are returned in
+%% the resulting list, otherwise they're skipped.
+%%
+dependencies(Reverse, Sources, AllPlugins) ->
+    {ok, G} = rabbit_misc:build_acyclic_graph(
+                fun (App, _Deps) -> [{App, App}] end,
+                fun (App,  Deps) -> [{App, Dep} || Dep <- Deps] end,
+                [{Name, Deps}
+                 || #plugin{name = Name, dependencies = Deps} <- AllPlugins]),
+    Dests = case Reverse of
+                false -> digraph_utils:reachable(Sources, G);
+                true  -> digraph_utils:reaching(Sources, G)
+            end,
+    true = digraph:delete(G),
+    Dests.
+
+%%----------------------------------------------------------------------------
+
+prepare_plugins(EnabledPluginsFile, PluginsDistDir, DestDir) ->
+    AllPlugins = list(PluginsDistDir),
+    Enabled = read_enabled(EnabledPluginsFile),
+    ToUnpack = dependencies(false, Enabled, AllPlugins),
+    ToUnpackPlugins = lookup_plugins(ToUnpack, AllPlugins),
+
+    Missing = Enabled -- plugin_names(ToUnpackPlugins),
+    case Missing of
+        [] -> ok;
+        _  -> io:format("Warning: the following enabled plugins were "
+                       "not found: ~p~n", [Missing])
+    end,
+
+    %% Eliminate the contents of the destination directory
+    case delete_recursively(DestDir) of
+        ok         -> ok;
+        {error, E} -> rabbit_misc:quit("Could not delete dir ~s (~p)",
+                                            [DestDir, E])
+    end,
+    case filelib:ensure_dir(DestDir ++ "/") of
+        ok          -> ok;
+        {error, E2} -> rabbit_misc:quit("Could not create dir ~s (~p)",
+                                             [DestDir, E2])
+    end,
+
+    [prepare_plugin(Plugin, DestDir) || Plugin <- ToUnpackPlugins].
+
+prepare_dir_plugin(PluginAppDescFn) ->
+    %% Add the plugin ebin directory to the load path
+    PluginEBinDirN = filename:dirname(PluginAppDescFn),
+    code:add_path(PluginEBinDirN),
+
+    %% We want the second-last token
+    NameTokens = string:tokens(PluginAppDescFn,"/."),
+    PluginNameString = lists:nth(length(NameTokens) - 1, NameTokens),
+    list_to_atom(PluginNameString).
+
+%%----------------------------------------------------------------------------
+
+delete_recursively(Fn) ->
+    case rabbit_file:recursive_delete([Fn]) of
+        ok                 -> ok;
+        {error, {Path, E}} -> {error, {cannot_delete, Path, E}};
+        Error              -> Error
+    end.
+
+prepare_plugin(#plugin{type = ez, location = Location}, PluginDestDir) ->
+    zip:unzip(Location, [{cwd, PluginDestDir}]);
+prepare_plugin(#plugin{type = dir, name = Name, location = Location},
+              PluginsDestDir) ->
+    rabbit_file:recursive_copy(Location,
+                              filename:join([PluginsDestDir, Name])).
+
 %% Get the #plugin{} from an .ez.
 get_plugin_info(Base, {ez, EZ0}) ->
     EZ = filename:join([Base, EZ0]),
@@ -245,78 +230,6 @@ parse_binary(Bin) ->
         Err -> {error, {invalid_app, Err}}
     end.
 
-%% Pretty print a list of plugins.
-format_plugins(Pattern, Opts, PluginsFile, PluginsDir) ->
-    Verbose = proplists:get_bool(?VERBOSE_OPT, Opts),
-    Minimal = proplists:get_bool(?MINIMAL_OPT, Opts),
-    Format = case {Verbose, Minimal} of
-                 {false, false} -> normal;
-                 {true,  false} -> verbose;
-                 {false, true}  -> minimal;
-                 {true,  true}  -> throw({error_string,
-                                          "Cannot specify -m and -v together"})
-             end,
-    OnlyEnabled    = proplists:get_bool(?ENABLED_OPT,     Opts),
-    OnlyEnabledAll = proplists:get_bool(?ENABLED_ALL_OPT, Opts),
-
-    AvailablePlugins = find_plugins(PluginsDir),
-    EnabledExplicitly = read_enabled_plugins(PluginsFile),
-    EnabledImplicitly =
-        calculate_required_plugins(EnabledExplicitly, AvailablePlugins) --
-        EnabledExplicitly,
-    {ok, RE} = re:compile(Pattern),
-    Plugins = [ Plugin ||
-                  Plugin = #plugin{name = Name} <- AvailablePlugins,
-                  re:run(atom_to_list(Name), RE, [{capture, none}]) =:= match,
-                  if OnlyEnabled    ->  lists:member(Name, EnabledExplicitly);
-                     OnlyEnabledAll -> (lists:member(Name, EnabledExplicitly) or
-                                        lists:member(Name, EnabledImplicitly));
-                     true           -> true
-                  end],
-    Plugins1 = usort_plugins(Plugins),
-    MaxWidth = lists:max([length(atom_to_list(Name)) ||
-                             #plugin{name = Name} <- Plugins1] ++ [0]),
-    [format_plugin(P, EnabledExplicitly, EnabledImplicitly, Format,
-                   MaxWidth) || P <- Plugins1],
-    ok.
-
-format_plugin(#plugin{name = Name, version = Version,
-                      description = Description, dependencies = Deps},
-              EnabledExplicitly, EnabledImplicitly, Format, MaxWidth) ->
-    Glyph = case {lists:member(Name, EnabledExplicitly),
-                  lists:member(Name, EnabledImplicitly)} of
-                {true, false} -> "[E]";
-                {false, true} -> "[e]";
-                _             -> "[ ]"
-            end,
-    case Format of
-        minimal -> io:format("~s~n", [Name]);
-        normal  -> io:format("~s ~-" ++ integer_to_list(MaxWidth) ++
-                                 "w ~s~n", [Glyph, Name, Version]);
-        verbose -> io:format("~s ~w~n", [Glyph, Name]),
-                   io:format("    Version:    \t~s~n", [Version]),
-                   case Deps of
-                       [] -> ok;
-                       _  -> io:format("    Dependencies:\t~p~n", [Deps])
-                   end,
-                   io:format("    Description:\t~s~n", [Description]),
-                   io:format("~n")
-    end.
-
-print_list(Header, Plugins) ->
-    io:format(fmt_list(Header, Plugins)).
-
-fmt_list(Header, Plugins) ->
-    lists:flatten(
-      [Header, $\n, [io_lib:format("  ~s~n", [P]) || P <- Plugins]]).
-
-usort_plugins(Plugins) ->
-    lists:usort(fun plugins_cmp/2, Plugins).
-
-plugins_cmp(#plugin{name = N1, version = V1},
-            #plugin{name = N2, version = V2}) ->
-    {N1, V1} =< {N2, V2}.
-
 %% Filter out applications that can be loaded *right now*.
 filter_applications(Applications) ->
     [Application || Application <- Applications,
@@ -339,71 +252,3 @@ plugin_names(Plugins) ->
 %% Find plugins by name in a list of plugins.
 lookup_plugins(Names, AllPlugins) ->
     [P || P = #plugin{name = Name} <- AllPlugins, lists:member(Name, Names)].
-
-%% Read the enabled plugin names from disk.
-read_enabled_plugins(PluginsFile) ->
-    case rabbit_file:read_term_file(PluginsFile) of
-        {ok, [Plugins]} -> Plugins;
-        {ok, []}        -> [];
-        {ok, [_|_]}     -> throw({error, {malformed_enabled_plugins_file,
-                                          PluginsFile}});
-        {error, enoent} -> [];
-        {error, Reason} -> throw({error, {cannot_read_enabled_plugins_file,
-                                          PluginsFile, Reason}})
-    end.
-
-%% Write the enabled plugin names on disk.
-write_enabled_plugins(PluginsFile, Plugins) ->
-    case rabbit_file:write_term_file(PluginsFile, [Plugins]) of
-        ok              -> ok;
-        {error, Reason} -> throw({error, {cannot_write_enabled_plugins_file,
-                                          PluginsFile, Reason}})
-    end.
-
-calculate_required_plugins(Sources, AllPlugins) ->
-    calculate_dependencies(false, Sources, AllPlugins).
-
-calculate_dependencies(Reverse, Sources, AllPlugins) ->
-    {ok, G} = rabbit_misc:build_acyclic_graph(
-                fun (App, _Deps) -> [{App, App}] end,
-                fun (App,  Deps) -> [{App, Dep} || Dep <- Deps] end,
-                [{Name, Deps}
-                 || #plugin{name = Name, dependencies = Deps} <- AllPlugins]),
-    Dests = case Reverse of
-                false -> digraph_utils:reachable(Sources, G);
-                true  -> digraph_utils:reaching(Sources, G)
-            end,
-    true = digraph:delete(G),
-    Dests.
-
-maybe_warn_mochiweb(Enabled) ->
-    V = erlang:system_info(otp_release),
-    case lists:member(mochiweb, Enabled) andalso V < "R13B01" of
-        true ->
-            Stars = string:copies("*", 80),
-            io:format("~n~n~s~n"
-                      "  Warning: Mochiweb enabled and Erlang version ~s "
-                      "detected.~n"
-                      "  Enabling plugins that depend on Mochiweb is not "
-                      "supported on this Erlang~n"
-                      "  version. At least R13B01 is required.~n~n"
-                      "  RabbitMQ will not start successfully in this "
-                      "configuration. You *must*~n"
-                      "  disable the Mochiweb plugin, or upgrade Erlang.~n"
-                      "~s~n~n~n", [Stars, V, Stars]);
-        false ->
-            ok
-    end.
-
-report_change() ->
-    io:format("Plugin configuration has changed. "
-              "Restart RabbitMQ for changes to take effect.~n"),
-    case os:type() of
-        {win32, _OsName} ->
-             io:format("If you have RabbitMQ running as a service then you must"
-                       " reinstall by running~n  rabbitmq-service.bat stop~n"
-                       "  rabbitmq-service.bat install~n"
-                       "  rabbitmq-service.bat start~n~n");
-        _ ->
-             ok
-    end.
diff --git a/src/rabbit_plugins_main.erl b/src/rabbit_plugins_main.erl
new file mode 100644
index 00000000..572cf150
--- /dev/null
+++ b/src/rabbit_plugins_main.erl
@@ -0,0 +1,273 @@
+%% The contents of this file are subject to the Mozilla Public License
+%% Version 1.1 (the "License"); you may not use this file except in
+%% compliance with the License. You may obtain a copy of the License
+%% at http://www.mozilla.org/MPL/
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and
+%% limitations under the License.
+%%
+%% The Original Code is RabbitMQ.
+%%
+%% The Initial Developer of the Original Code is VMware, Inc.
+%% Copyright (c) 2011-2012 VMware, Inc.  All rights reserved.
+%%
+
+-module(rabbit_plugins_main).
+-include("rabbit.hrl").
+
+-export([start/0, stop/0]).
+
+-define(VERBOSE_OPT, "-v").
+-define(MINIMAL_OPT, "-m").
+-define(ENABLED_OPT, "-E").
+-define(ENABLED_ALL_OPT, "-e").
+
+-define(VERBOSE_DEF, {?VERBOSE_OPT, flag}).
+-define(MINIMAL_DEF, {?MINIMAL_OPT, flag}).
+-define(ENABLED_DEF, {?ENABLED_OPT, flag}).
+-define(ENABLED_ALL_DEF, {?ENABLED_ALL_OPT, flag}).
+
+-define(GLOBAL_DEFS, []).
+
+-define(COMMANDS,
+        [{list, [?VERBOSE_DEF, ?MINIMAL_DEF, ?ENABLED_DEF, ?ENABLED_ALL_DEF]},
+         enable,
+         disable]).
+
+%%----------------------------------------------------------------------------
+
+-ifdef(use_specs).
+
+-spec(start/0 :: () -> no_return()).
+-spec(stop/0 :: () -> 'ok').
+-spec(usage/0 :: () -> no_return()).
+
+-endif.
+
+%%----------------------------------------------------------------------------
+
+start() ->
+    {ok, [[PluginsFile|_]|_]} =
+        init:get_argument(enabled_plugins_file),
+    {ok, [[PluginsDir|_]|_]} = init:get_argument(plugins_dist_dir),
+    {Command, Opts, Args} =
+        case rabbit_misc:parse_arguments(?COMMANDS, ?GLOBAL_DEFS,
+                                         init:get_plain_arguments())
+        of
+            {ok, Res}  -> Res;
+            no_command -> print_error("could not recognise command", []),
+                          usage()
+        end,
+
+    PrintInvalidCommandError =
+        fun () ->
+                print_error("invalid command '~s'",
+                            [string:join([atom_to_list(Command) | Args], " ")])
+        end,
+
+    case catch action(Command, Args, Opts, PluginsFile, PluginsDir) of
+        ok ->
+            rabbit_misc:quit(0);
+        {'EXIT', {function_clause, [{?MODULE, action, _} | _]}} ->
+            PrintInvalidCommandError(),
+            usage();
+        {'EXIT', {function_clause, [{?MODULE, action, _, _} | _]}} ->
+            PrintInvalidCommandError(),
+            usage();
+        {error, Reason} ->
+            print_error("~p", [Reason]),
+            rabbit_misc:quit(2);
+        {error_string, Reason} ->
+            print_error("~s", [Reason]),
+            rabbit_misc:quit(2);
+        Other ->
+            print_error("~p", [Other]),
+            rabbit_misc:quit(2)
+    end.
+
+stop() ->
+    ok.
+
+%%----------------------------------------------------------------------------
+
+action(list, [], Opts, PluginsFile, PluginsDir) ->
+    action(list, [".*"], Opts, PluginsFile, PluginsDir);
+action(list, [Pat], Opts, PluginsFile, PluginsDir) ->
+    format_plugins(Pat, Opts, PluginsFile, PluginsDir);
+
+action(enable, ToEnable0, _Opts, PluginsFile, PluginsDir) ->
+    case ToEnable0 of
+        [] -> throw({error_string, "Not enough arguments for 'enable'"});
+        _  -> ok
+    end,
+    AllPlugins = rabbit_plugins:list(PluginsDir),
+    Enabled = rabbit_plugins:read_enabled(PluginsFile),
+    ImplicitlyEnabled = rabbit_plugins:dependencies(false,
+                                                    Enabled, AllPlugins),
+    ToEnable = [list_to_atom(Name) || Name <- ToEnable0],
+    Missing = ToEnable -- plugin_names(AllPlugins),
+    case Missing of
+        [] -> ok;
+        _  -> throw({error_string,
+                     fmt_list("The following plugins could not be found:",
+                              Missing)})
+    end,
+    NewEnabled = lists:usort(Enabled ++ ToEnable),
+    write_enabled_plugins(PluginsFile, NewEnabled),
+    NewImplicitlyEnabled = rabbit_plugins:dependencies(false,
+                                                       NewEnabled, AllPlugins),
+    maybe_warn_mochiweb(NewImplicitlyEnabled),
+    case NewEnabled -- ImplicitlyEnabled of
+        [] -> io:format("Plugin configuration unchanged.~n");
+        _  -> print_list("The following plugins have been enabled:",
+                         NewImplicitlyEnabled -- ImplicitlyEnabled),
+              report_change()
+    end;
+
+action(disable, ToDisable0, _Opts, PluginsFile, PluginsDir) ->
+    case ToDisable0 of
+        [] -> throw({error_string, "Not enough arguments for 'disable'"});
+        _  -> ok
+    end,
+    ToDisable = [list_to_atom(Name) || Name <- ToDisable0],
+    Enabled = rabbit_plugins:read_enabled(PluginsFile),
+    AllPlugins = rabbit_plugins:list(PluginsDir),
+    Missing = ToDisable -- plugin_names(AllPlugins),
+    case Missing of
+        [] -> ok;
+        _  -> print_list("Warning: the following plugins could not be found:",
+                         Missing)
+    end,
+    ToDisableDeps = rabbit_plugins:dependencies(true, ToDisable, AllPlugins),
+    NewEnabled = Enabled -- ToDisableDeps,
+    case length(Enabled) =:= length(NewEnabled) of
+        true  -> io:format("Plugin configuration unchanged.~n");
+        false -> ImplicitlyEnabled =
+                     rabbit_plugins:dependencies(false, Enabled, AllPlugins),
+                 NewImplicitlyEnabled =
+                     rabbit_plugins:dependencies(false,
+                                                 NewEnabled, AllPlugins),
+                 print_list("The following plugins have been disabled:",
+                            ImplicitlyEnabled -- NewImplicitlyEnabled),
+                 write_enabled_plugins(PluginsFile, NewEnabled),
+                 report_change()
+    end.
+
+%%----------------------------------------------------------------------------
+
+print_error(Format, Args) ->
+    rabbit_misc:format_stderr("Error: " ++ Format ++ "~n", Args).
+
+usage() ->
+    io:format("~s", [rabbit_plugins_usage:usage()]),
+    rabbit_misc:quit(1).
+
+%% Pretty print a list of plugins.
+format_plugins(Pattern, Opts, PluginsFile, PluginsDir) ->
+    Verbose = proplists:get_bool(?VERBOSE_OPT, Opts),
+    Minimal = proplists:get_bool(?MINIMAL_OPT, Opts),
+    Format = case {Verbose, Minimal} of
+                 {false, false} -> normal;
+                 {true,  false} -> verbose;
+                 {false, true}  -> minimal;
+                 {true,  true}  -> throw({error_string,
+                                          "Cannot specify -m and -v together"})
+             end,
+    OnlyEnabled    = proplists:get_bool(?ENABLED_OPT,     Opts),
+    OnlyEnabledAll = proplists:get_bool(?ENABLED_ALL_OPT, Opts),
+
+    AvailablePlugins = rabbit_plugins:list(PluginsDir),
+    EnabledExplicitly = rabbit_plugins:read_enabled(PluginsFile),
+    EnabledImplicitly =
+        rabbit_plugins:dependencies(false, EnabledExplicitly,
+                                    AvailablePlugins) -- EnabledExplicitly,
+    {ok, RE} = re:compile(Pattern),
+    Plugins = [ Plugin ||
+                  Plugin = #plugin{name = Name} <- AvailablePlugins,
+                  re:run(atom_to_list(Name), RE, [{capture, none}]) =:= match,
+                  if OnlyEnabled    ->  lists:member(Name, EnabledExplicitly);
+                     OnlyEnabledAll -> (lists:member(Name,
+                                                     EnabledExplicitly) or
+                                        lists:member(Name, EnabledImplicitly));
+                     true           -> true
+                  end],
+    Plugins1 = usort_plugins(Plugins),
+    MaxWidth = lists:max([length(atom_to_list(Name)) ||
+                             #plugin{name = Name} <- Plugins1] ++ [0]),
+    [format_plugin(P, EnabledExplicitly, EnabledImplicitly, Format,
+                   MaxWidth) || P <- Plugins1],
+    ok.
+
+format_plugin(#plugin{name = Name, version = Version,
+                      description = Description, dependencies = Deps},
+              EnabledExplicitly, EnabledImplicitly, Format, MaxWidth) ->
+    Glyph = case {lists:member(Name, EnabledExplicitly),
+                  lists:member(Name, EnabledImplicitly)} of
+                {true, false} -> "[E]";
+                {false, true} -> "[e]";
+                _             -> "[ ]"
+            end,
+    case Format of
+        minimal -> io:format("~s~n", [Name]);
+        normal  -> io:format("~s ~-" ++ integer_to_list(MaxWidth) ++
+                                 "w ~s~n", [Glyph, Name, Version]);
+        verbose -> io:format("~s ~w~n", [Glyph, Name]),
+                   io:format("    Version:    \t~s~n", [Version]),
+                   case Deps of
+                       [] -> ok;
+                       _  -> io:format("    Dependencies:\t~p~n", [Deps])
+                   end,
+                   io:format("    Description:\t~s~n", [Description]),
+                   io:format("~n")
+    end.
+
+print_list(Header, Plugins) ->
+    io:format(fmt_list(Header, Plugins)).
+
+fmt_list(Header, Plugins) ->
+    lists:flatten(
+      [Header, $\n, [io_lib:format("  ~s~n", [P]) || P <- Plugins]]).
+
+usort_plugins(Plugins) ->
+    lists:usort(fun plugins_cmp/2, Plugins).
+
+plugins_cmp(#plugin{name = N1, version = V1},
+            #plugin{name = N2, version = V2}) ->
+    {N1, V1} =< {N2, V2}.
+
+%% Return the names of the given plugins.
+plugin_names(Plugins) ->
+    [Name || #plugin{name = Name} <- Plugins].
+
+%% Write the enabled plugin names on disk.
+write_enabled_plugins(PluginsFile, Plugins) ->
+    case rabbit_file:write_term_file(PluginsFile, [Plugins]) of
+        ok              -> ok;
+        {error, Reason} -> throw({error, {cannot_write_enabled_plugins_file,
+                                          PluginsFile, Reason}})
+    end.
+
+maybe_warn_mochiweb(Enabled) ->
+    V = erlang:system_info(otp_release),
+    case lists:member(mochiweb, Enabled) andalso V < "R13B01" of
+        true ->
+            Stars = string:copies("*", 80),
+            io:format("~n~n~s~n"
+                      "  Warning: Mochiweb enabled and Erlang version ~s "
+                      "detected.~n"
+                      "  Enabling plugins that depend on Mochiweb is not "
+                      "supported on this Erlang~n"
+                      "  version. At least R13B01 is required.~n~n"
+                      "  RabbitMQ will not start successfully in this "
+                      "configuration. You *must*~n"
+                      "  disable the Mochiweb plugin, or upgrade Erlang.~n"
+                      "~s~n~n~n", [Stars, V, Stars]);
+        false ->
+            ok
+    end.
+
+report_change() ->
+    io:format("Plugin configuration has changed. "
+              "Restart RabbitMQ for changes to take effect.~n").
diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl
index 162d44f1..d56211b5 100644
--- a/src/rabbit_prelaunch.erl
+++ b/src/rabbit_prelaunch.erl
@@ -31,212 +31,21 @@
 
 -spec(start/0 :: () -> no_return()).
 -spec(stop/0 :: () -> 'ok').
-%% Shut dialyzer up
--spec(terminate/1 :: (string()) -> no_return()).
--spec(terminate/2 :: (string(), [any()]) -> no_return()).
 
 -endif.
 
 %%----------------------------------------------------------------------------
 
 start() ->
-    io:format("Activating RabbitMQ plugins ...~n"),
-
-    %% Determine our various directories
-    [EnabledPluginsFile, PluginsDistDir, UnpackedPluginDir, NodeStr] =
-        init:get_plain_arguments(),
-    RootName = UnpackedPluginDir ++ "/rabbit",
-
-    prepare_plugins(EnabledPluginsFile, PluginsDistDir, UnpackedPluginDir),
-
-    %% Build a list of required apps based on the fixed set, and any plugins
-    PluginApps = find_plugins(UnpackedPluginDir),
-    RequiredApps = ?BaseApps ++ PluginApps,
-
-    %% Build the entire set of dependencies - this will load the
-    %% applications along the way
-    AllApps = case catch sets:to_list(expand_dependencies(RequiredApps)) of
-                  {failed_to_load_app, App, Err} ->
-                      terminate("failed to load application ~s:~n~p",
-                                [App, Err]);
-                  AppList ->
-                      AppList
-              end,
-    AppVersions = [determine_version(App) || App <- AllApps],
-    RabbitVersion = proplists:get_value(rabbit, AppVersions),
-
-    %% Build the overall release descriptor
-    RDesc = {release,
-             {"rabbit", RabbitVersion},
-             {erts, erlang:system_info(version)},
-             AppVersions},
-
-    %% Write it out to $RABBITMQ_PLUGINS_EXPAND_DIR/rabbit.rel
-    rabbit_file:write_file(RootName ++ ".rel", io_lib:format("~p.~n", [RDesc])),
-
-    %% We exclude mochiweb due to its optional use of fdsrv.
-    XRefExclude = [mochiweb],
-
-    %% Compile the script
-    ScriptFile = RootName ++ ".script",
-    case systools:make_script(RootName, [local, silent,
-                                         {exref, AllApps -- XRefExclude}]) of
-        {ok, Module, Warnings} ->
-            %% This gets lots of spurious no-source warnings when we
-            %% have .ez files, so we want to supress them to prevent
-            %% hiding real issues. On Ubuntu, we also get warnings
-            %% about kernel/stdlib sources being out of date, which we
-            %% also ignore for the same reason.
-            WarningStr = Module:format_warning(
-                           [W || W <- Warnings,
-                                 case W of
-                                     {warning, {source_not_found, _}} -> false;
-                                     {warning, {obj_out_of_date, {_,_,WApp,_,_}}}
-                                       when WApp == mnesia;
-                                            WApp == stdlib;
-                                            WApp == kernel;
-                                            WApp == sasl;
-                                            WApp == crypto;
-                                            WApp == os_mon -> false;
-                                     _ -> true
-                                 end]),
-            case length(WarningStr) of
-                0 -> ok;
-                _ -> S = string:copies("*", 80),
-                     io:format("~n~s~n~s~s~n~n", [S, WarningStr, S])
-            end,
-            ok;
-        {error, Module, Error} ->
-            terminate("generation of boot script file ~s failed:~n~s",
-                      [ScriptFile, Module:format_error(Error)])
-    end,
-
-    case post_process_script(ScriptFile) of
-        ok -> ok;
-        {error, Reason} ->
-            terminate("post processing of boot script file ~s failed:~n~w",
-                      [ScriptFile, Reason])
-    end,
-    case systools:script2boot(RootName) of
-        ok    -> ok;
-        error -> terminate("failed to compile boot script file ~s",
-                           [ScriptFile])
-    end,
-    io:format("~w plugins activated:~n", [length(PluginApps)]),
-    [io:format("* ~s-~s~n", [App, proplists:get_value(App, AppVersions)])
-     || App <- PluginApps],
-    io:nl(),
-
+    [NodeStr] = init:get_plain_arguments(),
     ok = duplicate_node_check(NodeStr),
-
-    terminate(0),
+    rabbit_misc:quit(0),
     ok.
 
 stop() ->
     ok.
 
-determine_version(App) ->
-    application:load(App),
-    {ok, Vsn} = application:get_key(App, vsn),
-    {App, Vsn}.
-
-delete_recursively(Fn) ->
-    case rabbit_file:recursive_delete([Fn]) of
-        ok                 -> ok;
-        {error, {Path, E}} -> {error, {cannot_delete, Path, E}};
-        Error              -> Error
-    end.
-
-prepare_plugins(EnabledPluginsFile, PluginsDistDir, DestDir) ->
-    AllPlugins = rabbit_plugins:find_plugins(PluginsDistDir),
-    Enabled = rabbit_plugins:read_enabled_plugins(EnabledPluginsFile),
-    ToUnpack = rabbit_plugins:calculate_required_plugins(Enabled, AllPlugins),
-    ToUnpackPlugins = rabbit_plugins:lookup_plugins(ToUnpack, AllPlugins),
-
-    Missing = Enabled -- rabbit_plugins:plugin_names(ToUnpackPlugins),
-    case Missing of
-        [] -> ok;
-        _  -> io:format("Warning: the following enabled plugins were "
-                        "not found: ~p~n", [Missing])
-    end,
-
-    %% Eliminate the contents of the destination directory
-    case delete_recursively(DestDir) of
-        ok         -> ok;
-        {error, E} -> terminate("Could not delete dir ~s (~p)", [DestDir, E])
-    end,
-    case filelib:ensure_dir(DestDir ++ "/") of
-        ok          -> ok;
-        {error, E2} -> terminate("Could not create dir ~s (~p)", [DestDir, E2])
-    end,
-
-    [prepare_plugin(Plugin, DestDir) || Plugin <- ToUnpackPlugins].
-
-prepare_plugin(#plugin{type = ez, location = Location}, PluginDestDir) ->
-    zip:unzip(Location, [{cwd, PluginDestDir}]);
-prepare_plugin(#plugin{type = dir, name = Name, location = Location},
-               PluginsDestDir) ->
-    rabbit_file:recursive_copy(Location,
-                               filename:join([PluginsDestDir, Name])).
-
-find_plugins(PluginDir) ->
-    [prepare_dir_plugin(PluginName) ||
-        PluginName <- filelib:wildcard(PluginDir ++ "/*/ebin/*.app")].
-
-prepare_dir_plugin(PluginAppDescFn) ->
-    %% Add the plugin ebin directory to the load path
-    PluginEBinDirN = filename:dirname(PluginAppDescFn),
-    code:add_path(PluginEBinDirN),
-
-    %% We want the second-last token
-    NameTokens = string:tokens(PluginAppDescFn,"/."),
-    PluginNameString = lists:nth(length(NameTokens) - 1, NameTokens),
-    list_to_atom(PluginNameString).
-
-expand_dependencies(Pending) ->
-    expand_dependencies(sets:new(), Pending).
-expand_dependencies(Current, []) ->
-    Current;
-expand_dependencies(Current, [Next|Rest]) ->
-    case sets:is_element(Next, Current) of
-        true ->
-            expand_dependencies(Current, Rest);
-        false ->
-            case application:load(Next) of
-                ok ->
-                    ok;
-                {error, {already_loaded, _}} ->
-                    ok;
-                {error, Reason} ->
-                    throw({failed_to_load_app, Next, Reason})
-            end,
-            {ok, Required} = application:get_key(Next, applications),
-            Unique = [A || A <- Required, not(sets:is_element(A, Current))],
-            expand_dependencies(sets:add_element(Next, Current), Rest ++ Unique)
-    end.
-
-post_process_script(ScriptFile) ->
-    case file:consult(ScriptFile) of
-        {ok, [{script, Name, Entries}]} ->
-            NewEntries = lists:flatmap(fun process_entry/1, Entries),
-            case file:open(ScriptFile, [write]) of
-                {ok, Fd} ->
-                    io:format(Fd, "%% script generated at ~w ~w~n~p.~n",
-                              [date(), time(), {script, Name, NewEntries}]),
-                    file:close(Fd),
-                    ok;
-                {error, OReason} ->
-                    {error, {failed_to_open_script_file_for_writing, OReason}}
-            end;
-        {error, Reason} ->
-            {error, {failed_to_load_script, Reason}}
-    end.
-
-process_entry(Entry = {apply,{application,start_boot,[mnesia,permanent]}}) ->
-    [{apply,{rabbit,maybe_hipe_compile,[]}},
-     {apply,{rabbit,prepare,[]}}, Entry];
-process_entry(Entry) ->
-    [Entry].
+%%----------------------------------------------------------------------------
 
 %% Check whether a node with the same name is already running
 duplicate_node_check([]) ->
@@ -252,11 +61,11 @@ duplicate_node_check(NodeStr) ->
                                   "already running on ~p~n",
                                   [NodeName, NodeHost]),
                         io:format(rabbit_nodes:diagnostics([Node]) ++ "~n"),
-                        terminate(?ERROR_CODE);
+                        rabbit_misc:quit(?ERROR_CODE);
                 false -> ok
             end;
         {error, EpmdReason} ->
-            terminate("epmd error for host ~p: ~p (~s)~n",
+            rabbit_misc:quit("epmd error for host ~p: ~p (~s)~n",
                       [NodeHost, EpmdReason,
                        case EpmdReason of
                            address -> "unable to establish tcp connection";
@@ -264,16 +73,3 @@ duplicate_node_check(NodeStr) ->
                            _       -> inet:format_error(EpmdReason)
                        end])
     end.
-
-terminate(Fmt, Args) ->
-    io:format("ERROR: " ++ Fmt ++ "~n", Args),
-    terminate(?ERROR_CODE).
-
-terminate(Status) ->
-    case os:type() of
-        {unix,  _} -> halt(Status);
-        {win32, _} -> init:stop(Status),
-                      receive
-                      after infinity -> ok
-                      end
-    end.
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index bae4928d..2760ef2d 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1603,7 +1603,7 @@ control_action(Command, Args, NewOpts) ->
                    expand_options(default_options(), NewOpts)).
 
 control_action(Command, Node, Args, Opts) ->
-    case catch rabbit_control:action(
+    case catch rabbit_control_main:action(
                  Command, Node, Args, Opts,
                  fun (Format, Args1) ->
                          io:format(Format ++ " ...~n", Args1)