diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-10-05 11:16:15 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-10-05 11:16:15 +0100 |
| commit | 93d4da21ab5dd95b8ed8b4d1b2c21761665dd268 (patch) | |
| tree | e2ddc7d94c92db5973054df7501a14bbcb4ffe03 /src/rabbit.erl | |
| parent | eb6f3f416c2d2d38ba6e823ec6267ebb007eb170 (diff) | |
| parent | 69a9b79549694c6896903a8a09b7eeb1ab89b4e8 (diff) | |
| download | rabbitmq-server-git-93d4da21ab5dd95b8ed8b4d1b2c21761665dd268.tar.gz | |
merging in from default
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 9b0470311b..892e3c8ba6 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]). @@ -57,6 +57,7 @@ -type(log_location() :: 'tty' | 'undefined' | string()). -type(file_suffix() :: binary()). +-spec(prepare/0 :: () -> 'ok'). -spec(start/0 :: () -> 'ok'). -spec(stop/0 :: () -> 'ok'). -spec(stop_and_halt/0 :: () -> 'ok'). @@ -71,11 +72,14 @@ %%---------------------------------------------------------------------------- +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(), - ok = rabbit_misc:start_applications(?APPS) + ok = prepare(), + ok = rabbit_misc:start_applications(?APPS) after %%give the error loggers some time to catch up timer:sleep(100) |