merge default into bug18732

6 files changed, 15 insertions, 11 deletions

diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi
index 4709ca0b43..5e4f4b3862 100755
--- a/scripts/rabbitmq-multi
+++ b/scripts/rabbitmq-multi
@@ -36,7 +36,7 @@ SCRIPT_HOME=$(dirname $0)
 export NODENAME NODE_IP_ADDRESS NODE_PORT SCRIPT_HOME PIDS_FILE
 
 exec erl \
-    -pa ../ebin \
+    -pa "`dirname $0`/../ebin" \
     -noinput \
     -hidden \
     ${ERL_ARGS} \
diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat
index 34e34ef9ee..819c99af5c 100644
--- a/scripts/rabbitmq-multi.bat
+++ b/scripts/rabbitmq-multi.bat
@@ -41,7 +41,7 @@ if "%NODE_PORT%"=="" (
 )

 

 set PIDS_FILE=%RABBITMQ_BASE%\rabbitmq.pids

-set SCRIPT_HOME=.

+set SCRIPT_HOME=%~dp0%

 

 if "%ERLANG_HOME%"=="" (

     set ERLANG_HOME=%~dp0%..\..\..

@@ -59,5 +59,5 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
     exit /B

 )

 

-"%ERLANG_HOME%\bin\erl.exe" -pa ../ebin -noinput -hidden -sname rabbitmq_multi -s rabbit_multi %START_ARGS% -extra %*

+"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -noinput -hidden -sname rabbitmq_multi -s rabbit_multi %START_ARGS% -extra %*

 

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index a44dd6da24..b930c8edd8 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -28,7 +28,10 @@
 [ "x" = "x$NODE_IP_ADDRESS" ] && NODE_IP_ADDRESS=0.0.0.0
 [ "x" = "x$NODE_PORT" ] && NODE_PORT=5672
 
-ERL_ARGS="+K true +A30 -kernel inet_default_listen_options [{sndbuf,16384},{recbuf,4096}]"
+ERL_ARGS="+K true +A30 \
+-kernel inet_default_listen_options [{nodelay,true},{sndbuf,16384},{recbuf,4096}] \
+-kernel inet_default_connect_options [{nodelay,true}]"
+
 CLUSTER_CONFIG_FILE=/etc/default/rabbitmq_cluster.config
 
 [ "x" = "x$LOG_BASE" ] && LOG_BASE=/var/log/rabbitmq
@@ -39,7 +42,7 @@ CLUSTER_CONFIG_FILE=/etc/default/rabbitmq_cluster.config
 ## Log rotation
 LOGS="${LOG_BASE}/${NODENAME}.log"
 SASL_LOGS="${LOG_BASE}/${NODENAME}-sasl.log"
-BACKUP_EXTENSION=".bak"
+BACKUP_EXTENSION=".1"
 
 [ -f  "${LOGS}" ] && cat "${LOGS}" >> "${LOGS}${BACKUP_EXTENSION}"
 [ -f  "${SASL_LOGS}" ] && cat "${SASL_LOGS}" >> "${SASL_LOGS}${BACKUP_EXTENSION}"
@@ -51,7 +54,7 @@ else
 fi
 
 erl \
-    -pa $(dirname $0)/../ebin \
+    -pa "`dirname $0`/../ebin" \
     ${START_RABBIT} \
     -sname ${NODENAME} \
     -boot start_sasl \
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 46f4bd923e..f08027d237 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -65,7 +65,7 @@ set LOG_BASE=%RABBITMQ_BASE_UNIX%/log
 rem We save the previous logs in their respective backup

 rem Log management (rotation, filtering based of size...) is left as an exercice for the user.

 

-set BACKUP_EXTENSION=.bak

+set BACKUP_EXTENSION=.1

 

 set LOGS="%RABBITMQ_BASE%\log\%NODENAME%.log"

 set SASL_LOGS="%RABBITMQ_BASE%\log\%NODENAME%-sasl.log"

@@ -92,14 +92,15 @@ set CLUSTER_CONFIG=-rabbit cluster_config \""%CLUSTER_CONFIG_FILE:\=/%"\"
 set MNESIA_DIR=%MNESIA_BASE%/%NODENAME%-mnesia

 

 "%ERLANG_HOME%\bin\erl.exe" ^

--pa ..\ebin ^

+-pa "%~dp0..\ebin" ^

 -noinput ^

 -boot start_sasl ^

 -sname %NODENAME% ^

 -s rabbit ^

 +W w ^

 +A30 ^

--kernel inet_default_listen_options "[{sndbuf, 16384}, {recbuf, 4096}]" ^

+-kernel inet_default_listen_options "[{nodelay, true}, {sndbuf, 16384}, {recbuf, 4096}]" ^

+-kernel inet_default_connect_options "[{nodelay, true}]" ^

 -rabbit tcp_listeners "[{\"%NODE_IP_ADDRESS%\", %NODE_PORT%}]" ^

 -kernel error_logger {file,\""%LOG_BASE%/%NODENAME%.log"\"} ^

 -sasl errlog_type error ^

diff --git a/scripts/rabbitmqctl b/scripts/rabbitmqctl
index eb359dad1f..419dcf632a 100755
--- a/scripts/rabbitmqctl
+++ b/scripts/rabbitmqctl
@@ -31,7 +31,7 @@ ERL_ARGS=
 MNESIA_DIR=${MNESIA_BASE}/${NODENAME}
 
 exec erl \
-    -pa ../ebin \
+    -pa "`dirname $0`/../ebin" \
     -noinput \
     -hidden \
     ${ERL_ARGS} \
diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index b34adebe06..1ee7e825b9 100644
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -40,4 +40,4 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
     exit /B

 )

 

-"%ERLANG_HOME%\bin\erl.exe" -pa ..\ebin -noinput -hidden -sname rabbitmqctl -s rabbit_control -extra %*

+"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -noinput -hidden -sname rabbitmqctl -s rabbit_control -extra %*