Ensure start_app considers plugins when using RABBITMQ_NODE_ONLY

- always start all enabled plugins, regardless of startup type
- only disable plugins that are currently running

The latter incidentally fixes bug 24941.

1 files changed, 8 insertions, 6 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index b4943a30f9..6c08520fd2 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -311,8 +311,7 @@ start() ->
                      ok = ensure_working_log_handlers(),
                      rabbit_node_monitor:prepare_cluster_status_files(),
                      rabbit_mnesia:check_cluster_consistency(),
-                     start_apps(app_startup_order()),
-                     ok = log_broker_started(rabbit_plugins:active())
+                     broker_start()
              end).
 
 boot() ->
@@ -327,12 +326,15 @@ boot() ->
                      %% the upgrade, since if we are a secondary node the
                      %% primary node will have forgotten us
                      rabbit_mnesia:check_cluster_consistency(),
-                     Plugins = rabbit_plugins:setup(),
-                     ToBeLoaded = Plugins ++ ?APPS,
-                     start_apps(ToBeLoaded),
-                     ok = log_broker_started(Plugins)
+                     broker_start()
              end).
 
+broker_start() ->
+    Plugins = rabbit_plugins:setup(),
+    ToBeLoaded = Plugins ++ ?APPS,
+    start_apps(ToBeLoaded),
+    ok = log_broker_started(rabbit_plugins:active()).
+
 handle_app_error(Term) ->
     fun(App, {bad_return, {_MFA, {'EXIT', {ExitReason, _}}}}) ->
             throw({Term, App, ExitReason});