diff options
| author | Michael Klishin <michael@rabbitmq.com> | 2014-04-28 02:49:24 +0400 |
|---|---|---|
| committer | Michael Klishin <michael@rabbitmq.com> | 2014-04-28 02:49:24 +0400 |
| commit | fc8065c864518fee2aae8fb8366159f4c81e2e45 (patch) | |
| tree | 60fe34705a97b6715f386efa08d6ee8f8ec86229 | |
| parent | fa19f516e243240151c172951cfce2644d228dd5 (diff) | |
| download | rabbitmq-server-git-fc8065c864518fee2aae8fb8366159f4c81e2e45.tar.gz | |
Respect RABBITMQ_NODE_ONLY env variable on Windows
Originally contributed by Marek Stój:
https://github.com/rabbitmq/rabbitmq-server/pull/34
| -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 043204faaa..1b909f9e0c 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -134,11 +134,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! ^
-sname !RABBITMQ_NODENAME! ^
+W w ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 7040209753..9902df9ce4 100755 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -211,9 +211,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 ^
|