diff options
| author | Diana Corbacho <diana@rabbitmq.com> | 2016-11-24 07:40:57 +0000 |
|---|---|---|
| committer | Diana Corbacho <diana@rabbitmq.com> | 2016-11-24 07:40:57 +0000 |
| commit | 025f9d7611dd0caf4ea86b8129fc75fedae33b92 (patch) | |
| tree | c741f5cb2242cc7844d56556c7c09ff1b07204a1 | |
| parent | 8bbe9ad3bd83f45a82401068eb7429cfcda42e76 (diff) | |
| download | rabbitmq-server-git-025f9d7611dd0caf4ea86b8129fc75fedae33b92.tar.gz | |
Move rabbit:prep_stop/1 to stop/1 to avoid master termination crash
| -rw-r--r-- | src/rabbit.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 1f0df1ad06..4906999a4f 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -22,7 +22,7 @@ stop_and_halt/0, await_startup/0, status/0, is_running/0, is_running/1, environment/0, rotate_logs/1, force_event_refresh/1, start_fhc/0]). --export([start/2, stop/1, prep_stop/1]). +-export([start/2, stop/1]). -export([start_apps/1, stop_apps/1]). -export([log_location/1, config_files/0, decrypt_config/2]). %% for testing and mgmt-agent @@ -690,7 +690,7 @@ start(normal, []) -> Error end. -prep_stop(_State) -> +stop(_State) -> ok = rabbit_alarm:stop(), ok = case rabbit_mnesia:is_clustered() of true -> ok; @@ -698,8 +698,6 @@ prep_stop(_State) -> end, ok. -stop(_) -> ok. - -spec boot_error(term(), not_available | [tuple()]) -> no_return(). boot_error({could_not_start, rabbit, {{timeout_waiting_for_tables, _}, _}}, |