Merge pull request #1169 from rabbitmq/more-info-during-shutdown

Add more info during rabbitmqctl shutdown

1 files changed, 6 insertions, 3 deletions

diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
index 9c512e256a..9cad46cb2c 100644
--- a/src/rabbit_control_main.erl
+++ b/src/rabbit_control_main.erl
@@ -156,7 +156,7 @@ start() ->
               Inform = case Quiet of
                            true  -> fun (_Format, _Args1) -> ok end;
                            false -> fun (Format, Args1) ->
-                                            io:format(Format ++ " ...~n", Args1)
+                                            io:format(Format ++ "~n", Args1)
                                     end
                        end,
               try
@@ -271,10 +271,13 @@ do_action(Command, Node, Args, Opts, Inform, Timeout) ->
     end.
 
 shutdown_node_and_wait_pid_to_stop(Node, Pid, Inform) ->
-    Inform("Shutting down RabbitMQ node ~p running at PID ~p", [Node, Pid]),
+    Inform("Shutting down RabbitMQ node ~p running at PID ~s", [Node, Pid]),
     Res = call(Node, {rabbit, stop_and_halt, []}),
     case Res of
-        ok -> wait_for_process_death(Pid);
+        ok ->
+            Inform("Waiting for PID ~s to terminate", [Pid]),
+            wait_for_process_death(Pid),
+            Inform("RabbitMQ node running at PID ~s successfully shut down", [Pid]);
         _  -> ok
     end,
     Res.