diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-11-29 16:35:45 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-11-29 16:35:45 +0000 |
| commit | 475e86b505d5b84e7140385692d0c80e33bca6fd (patch) | |
| tree | d5d785ca217219c536791728ae6e6006be74cfa6 /src/rabbit.erl | |
| parent | 55451523b84168ceeb36398f7a8e6734b35e969a (diff) | |
| parent | b907d34689879da7e9f2f4991d61e344a48cce30 (diff) | |
| download | rabbitmq-server-git-475e86b505d5b84e7140385692d0c80e33bca6fd.tar.gz | |
Merge branch 'master' into rabbitmq-server-567
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 6dde2aca88..ebc92150eb 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, alarms/0, is_running/1, environment/0, rotate_logs/0, 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_locations/0, config_files/0, decrypt_config/2]). %% for testing and mgmt-agent @@ -727,7 +727,7 @@ start(normal, []) -> Error end. -prep_stop(_State) -> +stop(_State) -> ok = rabbit_alarm:stop(), ok = case rabbit_mnesia:is_clustered() of true -> ok; @@ -735,9 +735,7 @@ prep_stop(_State) -> end, ok. -stop(_) -> ok. - --spec boot_error(atom(), term()) -> no_return(). +-spec boot_error(term(), not_available | [tuple()]) -> no_return(). boot_error(_, {could_not_start, rabbit, {{timeout_waiting_for_tables, _}, _}}) -> AllNodes = rabbit_mnesia:cluster_nodes(all), |