diff options
| -rw-r--r-- | src/rabbit.erl | 20 | ||||
| -rw-r--r-- | src/rabbit_msg_store.erl | 2 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 46c40e385c..1a69dd5b88 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -434,18 +434,26 @@ start_it(StartFun) -> stop() -> case whereis(rabbit_boot) of undefined -> ok; - _ -> await_startup(true) + _ -> + rabbit_log:info("RabbitMQ hasn't finished starting yet. Waiting for startup to finish before stopping..."), + await_startup(true) end, - rabbit_log:info("Stopping RabbitMQ~n", []), + rabbit_log:info("RabbitMQ is asked to stop...~n", []), Apps = ?APPS ++ rabbit_plugins:active(), stop_apps(app_utils:app_dependency_order(Apps, true)), - rabbit_log:info("Stopped RabbitMQ application~n", []). + rabbit_log:info("Successfully stopped RabbitMQ and its dependencies~n", []). stop_and_halt() -> try stop() + catch Type:Reason -> + rabbit_log:error("Error trying to stop RabbitMQ: ~p:~p", [Type, Reason]) after - rabbit_log:info("Halting Erlang VM~n", []), + AppsLeft = [ A || {A, _, _} <- application:which_applications() ], + rabbit_log:info( + lists:flatten(["Halting Erlang VM with the following applications:~n", + [" ~p~n" || _ <- AppsLeft]]), + AppsLeft), %% Also duplicate this information to stderr, so console where %% foreground broker was running (or systemd journal) will %% contain information about graceful termination. @@ -569,6 +577,10 @@ decrypt_list([Value|Tail], Algo, Acc) -> decrypt_list(Tail, Algo, [decrypt(Value, Algo)|Acc]). stop_apps(Apps) -> + rabbit_log:info( + lists:flatten(["Stopping RabbitMQ applications and their dependencies in the following order: ~n", + [" ~p~n" || _ <- Apps]]), + lists:reverse(Apps)), ok = app_utils:stop_applications( Apps, handle_app_error(error_during_shutdown)), case lists:member(rabbit, Apps) of diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 5e2e43a73d..100c49c2c6 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -985,6 +985,7 @@ terminate(_Reason, State = #msstate { index_state = IndexState, flying_ets = FlyingEts, clients = Clients, dir = Dir }) -> + rabbit_log:info("Stopping message store for directory '~s'", [Dir]), %% stop the gc first, otherwise it could be working and we pull %% out the ets tables from under it. ok = rabbit_msg_store_gc:stop(GCPid), @@ -1001,6 +1002,7 @@ terminate(_Reason, State = #msstate { index_state = IndexState, IndexModule:terminate(IndexState), ok = store_recovery_terms([{client_refs, dict:fetch_keys(Clients)}, {index_module, IndexModule}], Dir), + rabbit_log:info("Message store for directory '~s' is stopped", [Dir]), State3 #msstate { index_state = undefined, current_file_handle = undefined }. |