diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-06-03 20:06:59 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-06-03 20:06:59 +0300 |
| commit | 8ac770285b464c93930c6c27ce9dd01a13fc3a62 (patch) | |
| tree | fb11a2b87143563304277fc6aa2e8b39f470abef | |
| parent | 73f47630aa566d6ae7f4849aa36d0243195d7713 (diff) | |
| download | rabbitmq-server-git-8ac770285b464c93930c6c27ce9dd01a13fc3a62.tar.gz | |
Make it possible to override the +A VM flag with an env variable
For easier tweaking. References #178.
| -rwxr-xr-x | scripts/rabbitmq-env | 5 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server.bat | 6 | ||||
| -rwxr-xr-x | scripts/rabbitmq-service.bat | 6 |
3 files changed, 14 insertions, 3 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index eede788a93..c37f3e2b48 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -43,8 +43,11 @@ RABBITMQ_HOME="${SCRIPT_DIR}/.." ## Set defaults . ${SCRIPT_DIR}/rabbitmq-defaults +DEFAULT_IO_THREAD_POOL_SIZE=30 +[ "x" = "x$RABBITMQ_IO_THREAD_POOL_SIZE" ] && RABBITMQ_IO_THREAD_POOL_SIZE=${DEFAULT_IO_THREAD_POOL_SIZE} + ## Common defaults -SERVER_ERL_ARGS="+K true +A30 +P 1048576 \ +SERVER_ERL_ARGS="+K true +A $RABBITMQ_IO_THREAD_POOL_SIZE +P 1048576 \ -kernel inet_default_connect_options [{nodelay,true}]" # warn about old rabbitmq.conf file, if no new one diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 33d32f997c..5e9e11d0f8 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -147,6 +147,10 @@ if "!RABBITMQ_NODE_ONLY!"=="" ( set RABBITMQ_START_RABBIT=-s rabbit boot
)
+if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" {
+ set set RABBITMQ_IO_THREAD_POOL_ARG=30
+}
+
"!ERLANG_HOME!\bin\erl.exe" ^
-pa "!RABBITMQ_EBIN_ROOT!" ^
-noinput ^
@@ -155,7 +159,7 @@ if "!RABBITMQ_NODE_ONLY!"=="" ( !RABBITMQ_CONFIG_ARG! ^
!RABBITMQ_NAME_TYPE! !RABBITMQ_NODENAME! ^
+W w ^
-+A30 ^
++A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^
+P 1048576 ^
-kernel inet_default_connect_options "[{nodelay, true}]" ^
!RABBITMQ_LISTEN_ARG! ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 2c9c8e7855..57dda9dd35 100755 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -224,13 +224,17 @@ if "!RABBITMQ_NODE_ONLY!"=="" ( set RABBITMQ_START_RABBIT=-s rabbit boot
)
+if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" {
+ set RABBITMQ_IO_THREAD_POOL_SIZE=30
+}
+
set ERLANG_SERVICE_ARGUMENTS= ^
-pa "!RABBITMQ_EBIN_ROOT!" ^
!RABBITMQ_START_RABBIT! ^
-s rabbit boot ^
!RABBITMQ_CONFIG_ARG! ^
+W w ^
-+A30 ^
++A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^
+P 1048576 ^
-kernel inet_default_connect_options "[{nodelay,true}]" ^
!RABBITMQ_LISTEN_ARG! ^
|