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 | e568461378f24786577b4cf8f7aafbb548fac4ce (patch) | |
| tree | 60fe34705a97b6715f386efa08d6ee8f8ec86229 | |
| parent | f8ac89a9c92863dfb7eb9faeb812b166aafc3093 (diff) | |
| download | rabbitmq-server-bug26144.tar.gz | |
Respect RABBITMQ_NODE_ONLY env variable on Windowsbug26144
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 043204fa..1b909f9e 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 70402097..9902df9c 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 ^
|