diff options
| author | Paul Jones <paulj@lshift.net> | 2009-09-30 19:35:24 +0100 |
|---|---|---|
| committer | Paul Jones <paulj@lshift.net> | 2009-09-30 19:35:24 +0100 |
| commit | 8b137ce2e4d7902021b7d1f451ac4d2bc5bb13d5 (patch) | |
| tree | 99855d62768ea53d10e03012c9a30b7469b23f69 | |
| parent | 28051995b73b90d93482eddb296d9519237bef77 (diff) | |
| download | rabbitmq-server-8b137ce2e4d7902021b7d1f451ac4d2bc5bb13d5.tar.gz | |
Removed application starting changes, since these were causing a number of problems
| -rw-r--r-- | src/rabbit.erl | 19 | ||||
| -rw-r--r-- | src/rabbit_plugin_activator.erl | 13 |
2 files changed, 8 insertions, 24 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index e7baa107..62672c47 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -33,7 +33,7 @@ -behaviour(application). --export([boot/1, start/0, stop/0, stop_and_halt/0, status/0, rotate_logs/1]). +-export([prepare/0, start/0, stop/0, stop_and_halt/0, status/0, rotate_logs/1]). -export([start/2, stop/1]). @@ -59,7 +59,7 @@ -spec(start/0 :: () -> 'ok'). -spec(stop/0 :: () -> 'ok'). --spec(boot/1 :: ([atom()]) -> 'ok'). +-spec(prepare/0 :: () -> 'ok'). -spec(stop_and_halt/0 :: () -> 'ok'). -spec(rotate_logs/1 :: (file_suffix()) -> 'ok' | {'error', any()}). -spec(status/0 :: () -> @@ -72,26 +72,19 @@ %%---------------------------------------------------------------------------- -boot(Apps) -> +prepare() -> try ok = ensure_working_log_handlers(), - ok = rabbit_mnesia:ensure_mnesia_dir(), - - ok = rabbit_misc:start_applications(Apps) + ok = rabbit_mnesia:ensure_mnesia_dir() catch {error, Reason} -> - io:format("Failed to start Rabbit: ~p~n", [Reason]), - halt(1); - {'EXIT', Reason} -> - io:format("Component crashed whilst starting Rabbit: ~p~n", [Reason]), - halt(1); - Unknown -> - io:format("Unknown failure type whilst starting Rabbit: ~p~n", [Unknown]), + io:format("Failed to prepare Rabbit: ~p~n", [Reason]), halt(1) end. start() -> try + prepare(), rabbit:boot(?APPS) after %%give the error loggers some time to catch up diff --git a/src/rabbit_plugin_activator.erl b/src/rabbit_plugin_activator.erl index c40ac114..c85f4b1c 100644 --- a/src/rabbit_plugin_activator.erl +++ b/src/rabbit_plugin_activator.erl @@ -228,15 +228,6 @@ include_rabbit_prepare(RootName) -> process_entries([]) -> []; process_entries([Entry = {apply,{application,start_boot,[stdlib,permanent]}}|Rest]) -> - {Apps, RestBoot} = select_apps(Rest), - [Entry, {apply,{rabbit,boot,[Apps]}} | RestBoot]; + [Entry, {apply,{rabbit,prepare,[]}} | Rest]; process_entries([Entry|Rest]) -> - [Entry | process_entries(Rest)]. - -select_apps([]) -> - {[], []}; -select_apps([{apply,{application,start_boot,[Name,_]}}|Rest]) -> - {RestApps, RestRest} = select_apps(Rest), - {[Name|RestApps], RestRest}; -select_apps(RestEntries) -> - {[], RestEntries}.
\ No newline at end of file + [Entry | process_entries(Rest)].
\ No newline at end of file |