summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2011-09-21 12:04:29 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2011-09-21 12:04:29 +0100
commite9dc1ba83c3a05e015deab341e6cb6608e3a7e37 (patch)
tree977e812de486f6644a22da9d0dfb62ffe67355d7
parentc37efa4b3ee9d1502590eda87b3fab4fb4dd5c5a (diff)
downloadrabbitmq-server-git-e9dc1ba83c3a05e015deab341e6cb6608e3a7e37.tar.gz
remove redundant "-s rabbit" from windows startup scripts
...and bring the order of erl args in line with that of the Unix script, for aesthetic reasons
-rw-r--r--scripts/rabbitmq-server.bat3
-rw-r--r--scripts/rabbitmq-service.bat3
2 files changed, 2 insertions, 4 deletions
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 5e2097dbe9..84d24c458b 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -135,15 +135,14 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
-boot "!RABBITMQ_BOOT_FILE!" ^
!RABBITMQ_CONFIG_ARG! ^
-sname !RABBITMQ_NODENAME! ^
--s rabbit ^
+W w ^
+A30 ^
+P 1048576 ^
-kernel inet_default_connect_options "[{nodelay, true}]" ^
!RABBITMQ_LISTEN_ARG! ^
--kernel error_logger {file,\""!LOGS:\=/!"\"} ^
!RABBITMQ_SERVER_ERL_ARGS! ^
-sasl errlog_type error ^
+-kernel error_logger {file,\""!LOGS:\=/!"\"} ^
-sasl sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^
-os_mon start_cpu_sup true ^
-os_mon start_disksup false ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 7de7a716bc..60697d0b49 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -201,15 +201,14 @@ set ERLANG_SERVICE_ARGUMENTS= ^
!RABBITMQ_EBIN_PATH! ^
-boot "!RABBITMQ_BOOT_FILE!" ^
!RABBITMQ_CONFIG_ARG! ^
--s rabbit ^
+W w ^
+A30 ^
+P 1048576 ^
-kernel inet_default_connect_options "[{nodelay,true}]" ^
!RABBITMQ_LISTEN_ARG! ^
--kernel error_logger {file,\""!LOGS:\=/!"\"} ^
!RABBITMQ_SERVER_ERL_ARGS! ^
-sasl errlog_type error ^
+-kernel error_logger {file,\""!LOGS:\=/!"\"} ^
-sasl sasl_error_logger {file,\""!SASL_LOGS:\=/!"\"} ^
-os_mon start_cpu_sup true ^
-os_mon start_disksup false ^