diff options
| author | Michael Klishin <michael@rabbitmq.com> | 2015-02-11 14:32:27 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@rabbitmq.com> | 2015-02-11 14:32:27 +0300 |
| commit | c25a0baecf9979818538a91c62ec478b4d08cc5d (patch) | |
| tree | df128db56a6a25cc997abf31a283ccfc76fdbae8 | |
| parent | 4baac823d46fd7a92918d3d0dcc853342b924526 (diff) | |
| parent | 88b3a971b0f154f1415e5884bcca4afdf2221a37 (diff) | |
| download | rabbitmq-server-git-c25a0baecf9979818538a91c62ec478b4d08cc5d.tar.gz | |
merge stable into default
| -rwxr-xr-x | scripts/rabbitmq-server.bat | 7 | ||||
| -rwxr-xr-x | scripts/rabbitmq-service.bat | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 4fdb73b732..0f27006560 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -142,11 +142,16 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" ( )
)
+set RABBITMQ_START_RABBIT=
+if "!RABBITMQ_NODE_ONLY!"=="" (
+ set RABBITMQ_START_RABBIT=-s rabbit boot
+)
+
"!ERLANG_HOME!\bin\erl.exe" ^
-pa "!RABBITMQ_EBIN_ROOT!" ^
-noinput ^
-boot start_sasl ^
--s rabbit boot ^
+!RABBITMQ_START_RABBIT! ^
!RABBITMQ_CONFIG_ARG! ^
!RABBITMQ_NAME_TYPE! !RABBITMQ_NODENAME! ^
+W w ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index c5896b5967..770fd32f51 100755 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -219,9 +219,14 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" ( )
)
+set RABBITMQ_START_RABBIT=
+if "!RABBITMQ_NODE_ONLY!"=="" (
+ set RABBITMQ_START_RABBIT=-s rabbit boot
+)
+
set ERLANG_SERVICE_ARGUMENTS= ^
-pa "!RABBITMQ_EBIN_ROOT!" ^
--boot start_sasl ^
+!RABBITMQ_START_RABBIT! ^
-s rabbit boot ^
!RABBITMQ_CONFIG_ARG! ^
+W w ^
|