diff options
| author | Paul Jones <paulj@lshift.net> | 2009-09-24 11:09:48 +0100 |
|---|---|---|
| committer | Paul Jones <paulj@lshift.net> | 2009-09-24 11:09:48 +0100 |
| commit | d2095944c2bf98db37344f445041711dc5b6e998 (patch) | |
| tree | e8c05c0ec9e87b5c773ef249e88aa5c7da38d1e5 /src/rabbit.erl | |
| parent | 978685e6e075a102776fb3a1cd799ea2a48024cc (diff) | |
| download | rabbitmq-server-git-d2095944c2bf98db37344f445041711dc5b6e998.tar.gz | |
Added rabbit:prepare to the generated boot file; removed call to rabbit:start when using a boot file
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 27f085c223..242b6cc71f 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -33,7 +33,7 @@ -behaviour(application). --export([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]). @@ -71,10 +71,13 @@ %%---------------------------------------------------------------------------- +prepare() -> + ok = ensure_working_log_handlers(), + ok = rabbit_mnesia:ensure_mnesia_dir(). + start() -> try - ok = ensure_working_log_handlers(), - ok = rabbit_mnesia:ensure_mnesia_dir(), + prepare(), ok = rabbit_misc:start_applications(?APPS) after %%give the error loggers some time to catch up |