Make it possible to override the +A VM flag with an env variable

For easier tweaking. References #178.
rabbitmq · Jun 3, 2015 · 8ac7702 · 8ac7702
1 parent 73f4763
commit 8ac7702
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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! ^