diff options
| author | Michael Klishin <michael@novemberain.com> | 2016-06-15 03:14:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 03:14:09 +0300 |
| commit | da7b6b137fea2d7749619a5a10c9d25036579704 (patch) | |
| tree | 6870d98ceb8c3485df08fe4c8f152e87c8eb3ea4 /src | |
| parent | d8d72f12867599a1687b32a99a50fd4ce8ddbe1b (diff) | |
| parent | c1b917cc1857cb3b380bf8079e9295551a04b2b9 (diff) | |
| download | rabbitmq-server-git-da7b6b137fea2d7749619a5a10c9d25036579704.tar.gz | |
Merge pull request #843 from rabbitmq/rabbitmq-server-837
Removed confusing code from rabbit:stop
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index a1a70e5ee9..06c84b53b4 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]). +-export([start/2, stop/1, prep_stop/1]). -export([start_apps/1, stop_apps/1]). -export([log_location/1, config_files/0]). %% for testing and mgmt-agent @@ -590,14 +590,16 @@ start(normal, []) -> Error end. -stop(_State) -> +prep_stop(_State) -> ok = rabbit_alarm:stop(), ok = case rabbit_mnesia:is_clustered() of - true -> rabbit_amqqueue:on_node_down(node()); + true -> ok; false -> rabbit_table:clear_ram_only_tables() end, ok. +stop(_) -> ok. + -ifdef(use_specs). -spec(boot_error/2 :: (term(), not_available | [tuple()]) -> no_return()). -endif. |