diff options
| -rw-r--r-- | scripts/rabbitmq-defaults | 1 | ||||
| -rwxr-xr-x | scripts/rabbitmq-env | 6 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults index 9ee5127f5a..ad60734217 100644 --- a/scripts/rabbitmq-defaults +++ b/scripts/rabbitmq-defaults @@ -34,5 +34,6 @@ 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-env b/scripts/rabbitmq-env index 30de121f9a..90228aae8b 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -43,11 +43,8 @@ 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 +A $RABBITMQ_IO_THREAD_POOL_SIZE +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 @@ -143,6 +140,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} diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index bd72ba6caa..0ce61b90c8 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -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} \ |