diff options
| -rw-r--r-- | scripts/rabbitmq-defaults | 3 | ||||
| -rw-r--r-- | scripts/rabbitmq-defaults.bat | 4 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 5 | ||||
| -rw-r--r-- | scripts/rabbitmq-env.bat | 11 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 3 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server.bat | 8 | ||||
| -rwxr-xr-x | scripts/rabbitmq-service.bat | 6 |
7 files changed, 33 insertions, 7 deletions
diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults index 1cf9152afb..ad60734217 100644 --- a/scripts/rabbitmq-defaults +++ b/scripts/rabbitmq-defaults @@ -26,11 +26,14 @@ SASL_BOOT_FILE=start_sasl ## Set default values +BOOT_MODULE="rabbit" + CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins PLUGINS_DIR="${RABBITMQ_HOME}/plugins" +IO_THREAD_POOL_SIZE=30 CONF_ENV_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq-env.conf diff --git a/scripts/rabbitmq-defaults.bat b/scripts/rabbitmq-defaults.bat index f1544d0bcd..d3983f22cf 100644 --- a/scripts/rabbitmq-defaults.bat +++ b/scripts/rabbitmq-defaults.bat @@ -17,10 +17,12 @@ if "!RABBITMQ_BASE!"=="" ( set RABBITMQ_BASE=!APPDATA!\RabbitMQ ) +REM BOOT_MODULE="rabbit" REM CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq REM LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq REM MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia REM ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins +set BOOT_MODULE=rabbit set CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq set LOG_BASE=!RABBITMQ_BASE!\log set MNESIA_BASE=!RABBITMQ_BASE!\db @@ -32,4 +34,4 @@ set PLUGINS_DIR=!TDP0!..\plugins REM CONF_ENV_FILE=${SYS_PREFIX}/etc/rabbitmq/rabbitmq-env.conf if "!RABBITMQ_CONF_ENV_FILE!"=="" ( set CONF_ENV_FILE=!APPDATA!\RabbitMQ\rabbitmq-env-conf.bat -)
\ No newline at end of file +) diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index ea27d59089..7bf7a97ed8 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -51,7 +51,7 @@ RABBITMQ_HOME="${RABBITMQ_SCRIPTS_DIR}/.." . ${RABBITMQ_SCRIPTS_DIR}/rabbitmq-defaults ## Common defaults -SERVER_ERL_ARGS="+K true +A30 +P 1048576 \ +SERVER_ERL_ARGS="+K true +P 1048576 \ -kernel inet_default_connect_options [{nodelay,true}]" # warn about old rabbitmq.conf file, if no new one @@ -175,6 +175,7 @@ DEFAULT_NODE_PORT=5672 [ "x" = "x$RABBITMQ_DIST_PORT" ] && [ "x" != "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_DIST_PORT=$((${RABBITMQ_NODE_PORT} + 20000)) [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} +[ "x" = "x$RABBITMQ_IO_THREAD_POOL_SIZE" ] && RABBITMQ_IO_THREAD_POOL_SIZE=${IO_THREAD_POOL_SIZE} [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS} [ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE} [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE} @@ -194,6 +195,8 @@ rmq_normalize_path_var \ [ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${RABBITMQ_MNESIA_DIR}.pid rmq_normalize_path_var RABBITMQ_PID_FILE +[ "x" = "x$RABBITMQ_BOOT_MODULE" ] && RABBITMQ_BOOT_MODULE=${BOOT_MODULE} + [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR} [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand rmq_normalize_path_var RABBITMQ_PLUGINS_EXPAND_DIR diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index 7b042d8e26..77bcd65b73 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -201,6 +201,15 @@ REM [ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${PID_FILE} REM [ "x" = "x$RABBITMQ_PID_FILE" ] && RABBITMQ_PID_FILE=${RABBITMQ_MNESIA_DIR}.pid REM No Windows equivalent +REM [ "x" = "x$RABBITMQ_BOOT_MODULE" ] && RABBITMQ_BOOT_MODULE=${BOOT_MODULE} +if "!RABBITMQ_BOOT_MODULE!"=="" ( + if "!BOOT_MODULE!"=="" ( + set RABBITMQ_BOOT_MODULE=rabbit + ) else ( + set RABBITMQ_BOOT_MODULE=!BOOT_MODULE! + ) +) + REM [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${PLUGINS_EXPAND_DIR} REM [ "x" = "x$RABBITMQ_PLUGINS_EXPAND_DIR" ] && RABBITMQ_PLUGINS_EXPAND_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME}-plugins-expand if "!RABBITMQ_PLUGINS_EXPAND_DIR!"=="" ( @@ -274,4 +283,4 @@ if "!RABBITMQ_SERVICENAME!"=="" ( REM ##--- End of overridden <var_name> variables REM REM # Since we source this elsewhere, don't accidentally stop execution -REM true
\ No newline at end of file +REM true diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index a6f4be9902..0ce61b90c8 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -21,7 +21,7 @@ RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT=" -noinput" -[ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="$RABBITMQ_START_RABBIT -s rabbit boot " +[ "x" = "x$RABBITMQ_NODE_ONLY" ] && RABBITMQ_START_RABBIT="$RABBITMQ_START_RABBIT -s $RABBITMQ_BOOT_MODULE boot " case "$(uname -s)" in CYGWIN*) # we make no attempt to record the cygwin pid; rabbitmqctl wait @@ -107,6 +107,7 @@ exec ${ERL_DIR}erl \ -boot "${SASL_BOOT_FILE}" \ ${RABBITMQ_CONFIG_ARG} \ +W w \ + +A ${RABBITMQ_IO_THREAD_POOL_SIZE} \ ${RABBITMQ_SERVER_ERL_ARGS} \ ${RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS} \ ${RABBITMQ_LISTEN_ARG} \ diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 9b334a5a13..fdc38c726d 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -73,9 +73,13 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" ( set RABBITMQ_START_RABBIT=
if "!RABBITMQ_NODE_ONLY!"=="" (
- set RABBITMQ_START_RABBIT=-s rabbit boot
+ set RABBITMQ_START_RABBIT=-s "!RABBITMQ_BOOT_MODULE!" 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 ^
@@ -84,7 +88,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 ddf0f53334..da87ca94e1 100755 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -149,13 +149,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!" ^
-boot start_sasl ^
!RABBITMQ_START_RABBIT! ^
!RABBITMQ_CONFIG_ARG! ^
+W w ^
-+A30 ^
++A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^
+P 1048576 ^
-kernel inet_default_connect_options "[{nodelay,true}]" ^
!RABBITMQ_LISTEN_ARG! ^
|