diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-10-20 15:10:13 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-10-20 15:10:13 +0100 |
| commit | 3e06c88ea1ffe6c7ccaf905c0c0173e224ed2925 (patch) | |
| tree | a4104270ac207c9598c6c9f4f444d464294cd0ea | |
| parent | 937f775e42aeeae7726ae780a884644cdd828751 (diff) | |
| parent | e972ee82d5691f19f51f589f6a3890ce89b590d4 (diff) | |
| download | rabbitmq-server-git-3e06c88ea1ffe6c7ccaf905c0c0173e224ed2925.tar.gz | |
merge bug24510 (make start-background-node start-rabbit-on-node breaks logging after bug 24332)
Also, don't fail if rabbit is already loaded.
| -rw-r--r-- | src/mirrored_supervisor_tests.erl | 1 | ||||
| -rw-r--r-- | src/rabbit.erl | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/mirrored_supervisor_tests.erl b/src/mirrored_supervisor_tests.erl index ee9c759374..5e782a08d3 100644 --- a/src/mirrored_supervisor_tests.erl +++ b/src/mirrored_supervisor_tests.erl @@ -202,6 +202,7 @@ with_sups(Fun, Sups) -> Pids = [begin {ok, Pid} = start_sup(Sup), Pid end || Sup <- Sups], Fun(Pids), [kill(Pid) || Pid <- Pids, is_process_alive(Pid)], + timer:sleep(100), passed. start_sup(Spec) -> diff --git a/src/rabbit.erl b/src/rabbit.erl index 1c11f5af9e..530955c201 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -225,8 +225,12 @@ prepare() -> start() -> try %% prepare/1 ends up looking at the rabbit app's env, so it - %% needs to be loaded. - ok = application:load(rabbit), + %% needs to be loaded, but during the tests, it may end up + %% getting loaded twice, so guard against that + case application:load(rabbit) of + ok -> ok; + {error, {already_loaded, rabbit}} -> ok + end, ok = prepare(), ok = rabbit_misc:start_applications(application_load_order()) after |