diff options
| author | Michael Klishin <michael@novemberain.com> | 2016-11-24 13:56:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-24 13:56:47 +0300 |
| commit | 77c428c8bb12dba998194f45afe41a0fbfc6df35 (patch) | |
| tree | 542ee13aa0fa43d45b545b5d03bf987d4212ef8a /src | |
| parent | beb8e52c3648c06340c4c1d6b573a2570d4ee0dd (diff) | |
| parent | 025f9d7611dd0caf4ea86b8129fc75fedae33b92 (diff) | |
| download | rabbitmq-server-git-77c428c8bb12dba998194f45afe41a0fbfc6df35.tar.gz | |
Merge pull request #1036 from rabbitmq/rabbitmq-server-1035
Termination of queue master fails with `{badmatch,{error,not_found}}`
Diffstat (limited to 'src')
| -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, _}, _}}, |