root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'stable'

This commit is contained in:
Michael Klishin 2015-07-07 22:05:32 +03:00
parent 11b110a816 5c3c0e6f38
commit bd3cd13db7
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/rabbitmq-env
View File

@ -51,8 +51,7 @@ RABBITMQ_HOME="${RABBITMQ_SCRIPTS_DIR}/.."
. ${RABBITMQ_SCRIPTS_DIR}/rabbitmq-defaults . ${RABBITMQ_SCRIPTS_DIR}/rabbitmq-defaults
## Common defaults ## Common defaults
SERVER_ERL_ARGS="+K true +P 1048576 \ SERVER_ERL_ARGS="+P 1048576"
-kernel inet_default_connect_options [{nodelay,true}]"
# warn about old rabbitmq.conf file, if no new one # warn about old rabbitmq.conf file, if no new one
if [ -f /etc/rabbitmq/rabbitmq.conf ] && \ if [ -f /etc/rabbitmq/rabbitmq.conf ] && \

7
scripts/rabbitmq-env.bat
View File

@ -39,8 +39,7 @@ call "%SCRIPT_DIR%\rabbitmq-defaults.bat"
REM These common defaults aren't referenced in the batch scripts REM These common defaults aren't referenced in the batch scripts
REM ## Common defaults REM ## Common defaults
REM SERVER_ERL_ARGS="+K true +A30 +P 1048576 \ REM SERVER_ERL_ARGS="+P 1048576"
REM -kernel inet_default_connect_options [{nodelay,true}]"
REM REM
REM # warn about old rabbitmq.conf file, if no new one REM # warn about old rabbitmq.conf file, if no new one
REM if [ -f /etc/rabbitmq/rabbitmq.conf ] && \ REM if [ -f /etc/rabbitmq/rabbitmq.conf ] && \
@ -51,9 +50,7 @@ REM fi
REM ERL_ARGS aren't referenced in the batch scripts REM ERL_ARGS aren't referenced in the batch scripts
REM Common defaults REM Common defaults
REM set SERVER_ERL_ARGS=+A30 ^ REM set SERVER_ERL_ARGS=+P 1048576
REM +P 1048576 ^
REM -kernel inet_default_connect_options "[{nodelay, true}]" ^
REM ## Get configuration variables from the configure environment file REM ## Get configuration variables from the configure environment file
REM [ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} || true REM [ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} || true

2
scripts/rabbitmq-server
View File

@ -109,6 +109,8 @@ exec ${ERL_DIR}erl \
+W w \ +W w \
+A ${RABBITMQ_IO_THREAD_POOL_SIZE} \ +A ${RABBITMQ_IO_THREAD_POOL_SIZE} \
${RABBITMQ_SERVER_ERL_ARGS} \ ${RABBITMQ_SERVER_ERL_ARGS} \
+K true \
-kernel inet_default_connect_options "[{nodelay,true}]" \
${RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS} \ ${RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS} \
${RABBITMQ_LISTEN_ARG} \ ${RABBITMQ_LISTEN_ARG} \
-sasl errlog_type error \ -sasl errlog_type error \

2
scripts/rabbitmq-server.bat
View File

@ -90,9 +90,9 @@ if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" {
+W w ^ +W w ^
+A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^ +A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^
+P 1048576 ^ +P 1048576 ^
-kernel inet_default_connect_options "[{nodelay, true}]" ^
!RABBITMQ_LISTEN_ARG! ^ !RABBITMQ_LISTEN_ARG! ^
!RABBITMQ_SERVER_ERL_ARGS! ^ !RABBITMQ_SERVER_ERL_ARGS! ^
-kernel inet_default_connect_options "[{nodelay, true}]" ^
!RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS! ^ !RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS! ^
-sasl errlog_type error ^ -sasl errlog_type error ^
-sasl sasl_error_logger false ^ -sasl sasl_error_logger false ^