Remove lots of io:format debugging and tidy up rpc error messages

2 files changed, 12 insertions, 14 deletions

diff --git a/src/rabbit_boot.erl b/src/rabbit_boot.erl
index e2174ddd9a..d1b32b6a96 100644
--- a/src/rabbit_boot.erl
+++ b/src/rabbit_boot.erl
@@ -101,7 +101,6 @@ start(Apps) ->
         ensure_boot_table(),
         force_reload(Apps),
         StartupApps = app_utils:app_dependency_order(Apps, false),
-        io:format("App Start Order: ~p~n", [StartupApps]),
         case whereis(?MODULE) of
             undefined -> run_boot_steps();
             _         -> ok
@@ -121,30 +120,21 @@ stop(Apps) ->
                     lists:foldl(fun sets:add_element/2, Set,
                                 app_utils:direct_dependencies(App) -- [rabbit])
             end, sets:new(), Apps)),
-    io:format("Target Apps = ~p~n", [TargetApps]),
     try
         ok = app_utils:stop_applications(
                TargetApps, handle_app_error(error_during_shutdown))
     after
         try
-            io:format("Running Cleanup~n"),
             BootSteps = load_steps(rabbit_boot_step),
             ToDelete = [Step || {App, _, _}=Step <- BootSteps,
                                 lists:member(App, TargetApps)],
-            io:format("Boot steps on shutdown: ~p~n", [ToDelete]),
-            [begin
-                 ets:delete(?MODULE, Step),
-                 io:format("Deleted ~p~n", [Step])
-             end || {_, Step, _} <- ToDelete],
-            io:format("Run cleanup steps~n"),
+            [ets:delete(?MODULE, Step) || {_, Step, _} <- ToDelete],
             run_cleanup_steps(TargetApps)
         after
-            io:format("save boot table~n"),
             save_boot_table()
         end,
         [begin
              {ok, Mods} = application:get_key(App, modules),
-             io:format("cleanup ~p...~n", [Mods]),
              [begin
                   code:soft_purge(Mod),
                   code:delete(Mod),
diff --git a/src/rabbit_plugins_main.erl b/src/rabbit_plugins_main.erl
index b7222c1ee4..47ece0395b 100644
--- a/src/rabbit_plugins_main.erl
+++ b/src/rabbit_plugins_main.erl
@@ -283,9 +283,17 @@ write_enabled_plugins(PluginsFile, Plugins) ->
 action_change(Node, Action, Targets) ->
     rpc_call(Node, rabbit_plugins, Action, [Targets]).
 
-rpc_call(Node, Mod, Fun, Args) ->
-    case rpc:call(Node, Mod, Fun, Args, ?RPC_TIMEOUT) of
+rpc_call(Node, Mod, Action, Args) ->
+    case rpc:call(Node, Mod, Action, Args, ?RPC_TIMEOUT) of
         {badrpc, nodedown} -> io:format("Plugin configuration has changed.~n");
-        _                  -> ok
+        ok                 -> io:format("Plugin(s) ~pd.~n", [Action]);
+        %% QA question: if we get into a situation where the rpc call fails,
+        %% does it make sense to suggest a restart as we do here? The restart
+        %% would only succeed if the failure (here) was due to a bug in the
+        %% rabbit_plugins:enable/1 code afaict.
+        Error              -> io:format("Unable to ~p plugin(s). "
+                                        "Please restart the broker "
+                                        "to apply your changes.~nError: ~p~n",
+                                        [Action, Error])
     end.