diff options
| author | Tim Watson <tim.watson@gmail.com> | 2012-05-08 09:31:49 +0100 |
|---|---|---|
| committer | Tim Watson <tim.watson@gmail.com> | 2012-05-08 09:31:49 +0100 |
| commit | 764f688edb74e2cc9bbf59ef49e8b47a4a75452d (patch) | |
| tree | e53ea51182798905aa48e702025e0e56ac70120c | |
| parent | 68b379dc3134cb4a4a08990bfda2a6fb713eb596 (diff) | |
| download | rabbitmq-server-git-764f688edb74e2cc9bbf59ef49e8b47a4a75452d.tar.gz | |
rename start_cold to boot
| -rwxr-xr-x | scripts/rabbitmq-server | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server.bat | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-service.bat | 2 | ||||
| -rw-r--r-- | src/rabbit.erl | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 4dd81a84fd..e041d42502 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -105,7 +105,7 @@ exec erl \ ${RABBITMQ_START_RABBIT} \ -sname ${RABBITMQ_NODENAME} \ -boot ${RABBITMQ_BOOT_FILE} \ - -s rabbit start_cold \ + -s rabbit boot \ ${RABBITMQ_CONFIG_ARG} \ +W w \ ${RABBITMQ_SERVER_ERL_ARGS} \ diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 0967024aa9..e594522df3 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -119,7 +119,7 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" ( -pa "!RABBITMQ_EBIN_ROOT!" ^
-noinput ^
-boot start_sasl ^
--s rabbit start_cold ^
+-s rabbit boot ^
!RABBITMQ_CONFIG_ARG! ^
-sname !RABBITMQ_NODENAME! ^
+W w ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index f49ec26699..849bedcf6b 100755 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -177,7 +177,7 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" ( set ERLANG_SERVICE_ARGUMENTS= ^
-pa "!RABBITMQ_EBIN_ROOT!" ^
-boot start_sasl ^
--s rabbit start_cold ^
+-s rabbit boot ^
!RABBITMQ_CONFIG_ARG! ^
+W w ^
+A30 ^
diff --git a/src/rabbit.erl b/src/rabbit.erl index 0d00706b76..b7e640ffb2 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -18,7 +18,7 @@ -behaviour(application). --export([maybe_hipe_compile/0, prepare/0, start/0, start_cold/0, stop/0, +-export([maybe_hipe_compile/0, prepare/0, start/0, boot/0, stop/0, stop_and_halt/0, status/0, is_running/0, is_running/1, environment/0, rotate_logs/1, force_event_refresh/0]). @@ -217,7 +217,7 @@ -spec(maybe_hipe_compile/0 :: () -> 'ok'). -spec(prepare/0 :: () -> 'ok'). -spec(start/0 :: () -> 'ok'). --spec(start_cold/0 :: () -> 'ok'). +-spec(boot/0 :: () -> 'ok'). -spec(stop/0 :: () -> 'ok'). -spec(stop_and_halt/0 :: () -> no_return()). -spec(status/0 :: @@ -302,7 +302,7 @@ start() -> ok = print_plugin_info(rabbit_plugins:active_plugins()) end). -start_cold() -> +boot() -> start_it(fun() -> ok = prepare(), Plugins = rabbit_plugins:bootstrap_envinronment(), |