diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-10-19 14:14:25 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-10-19 14:14:25 +0100 |
| commit | 904f841d161001483cefaa5d9aacdb049f90204f (patch) | |
| tree | c5556c66caadac783e133d9487bc73290d7d009e /src | |
| parent | 919f1011640f8a95a52376ddad85d42da5d0f580 (diff) | |
| parent | 804c4bb4f3396f4ef5d60d12fb5beb77634ffce9 (diff) | |
| download | rabbitmq-server-904f841d161001483cefaa5d9aacdb049f90204f.tar.gz | |
Merge bug25205
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_backing_queue_qc.erl | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index c3938312..ae73ebc8 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -303,6 +303,7 @@ start() -> ok = ensure_working_log_handlers(), rabbit_node_monitor:prepare_cluster_status_files(), rabbit_mnesia:check_cluster_consistency(), + exit(bang), ok = app_utils:start_applications( app_startup_order(), fun handle_app_error/2), ok = print_plugin_info(rabbit_plugins:active()) @@ -349,7 +350,7 @@ start_it(StartFun) -> end. stop() -> - rabbit_log:info("Stopping Rabbit~n"), + rabbit_log:info("Stopping RabbitMQ~n"), ok = app_utils:stop_applications(app_shutdown_order()). stop_and_halt() -> @@ -417,6 +418,9 @@ rotate_logs(BinarySuffix) -> start(normal, []) -> case erts_version_check() of ok -> + {ok, Vsn} = application:get_key(rabbit, vsn), + error_logger:info_msg("Starting RabbitMQ ~s on Erlang ~s~n", + [Vsn, erlang:system_info(otp_release)]), {ok, SupPid} = rabbit_sup:start_link(), true = register(rabbit, self()), print_banner(), diff --git a/src/rabbit_backing_queue_qc.erl b/src/rabbit_backing_queue_qc.erl index e40d9b29..d658f0f0 100644 --- a/src/rabbit_backing_queue_qc.erl +++ b/src/rabbit_backing_queue_qc.erl @@ -391,4 +391,13 @@ drop_messages(Messages) -> end end. +-else. + +-export([prop_disabled/0]). + +prop_disabled() -> + exit({compiled_without_proper, + "PropEr was not present during compilation of the test module. " + "Hence all tests are disabled."}). + -endif. |