Skip to content

Commit de7ef86

Browse files
Merge pull request #1169 from rabbitmq/more-info-during-shutdown
Add more info during rabbitmqctl shutdown
2 parents 7741b37 + 48182de commit de7ef86

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/rabbit_control_main.erl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ start() ->
156156
Inform = case Quiet of
157157
true -> fun (_Format, _Args1) -> ok end;
158158
false -> fun (Format, Args1) ->
159-
io:format(Format ++ " ...~n", Args1)
159+
io:format(Format ++ "~n", Args1)
160160
end
161161
end,
162162
try
@@ -271,10 +271,13 @@ do_action(Command, Node, Args, Opts, Inform, Timeout) ->
271271
end.
272272

273273
shutdown_node_and_wait_pid_to_stop(Node, Pid, Inform) ->
274-
Inform("Shutting down RabbitMQ node ~p running at PID ~p", [Node, Pid]),
274+
Inform("Shutting down RabbitMQ node ~p running at PID ~s", [Node, Pid]),
275275
Res = call(Node, {rabbit, stop_and_halt, []}),
276276
case Res of
277-
ok -> wait_for_process_death(Pid);
277+
ok ->
278+
Inform("Waiting for PID ~s to terminate", [Pid]),
279+
wait_for_process_death(Pid),
280+
Inform("RabbitMQ node running at PID ~s successfully shut down", [Pid]);
278281
_ -> ok
279282
end,
280283
Res.

0 commit comments

Comments
 (0)