Merged default into bug21742.

7 files changed, 70 insertions, 38 deletions

diff --git a/scripts/rabbitmq-activate-plugins.bat b/scripts/rabbitmq-activate-plugins.bat
index 3540bf2d9b..e7aa709544 100644
--- a/scripts/rabbitmq-activate-plugins.bat
+++ b/scripts/rabbitmq-activate-plugins.bat
@@ -30,6 +30,8 @@ REM
 REM   Contributor(s): ______________________________________.

 REM

 

+setlocal

+

 if not exist "%ERLANG_HOME%\bin\erl.exe" (

     echo.

     echo ******************************

@@ -42,8 +44,17 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
     exit /B

 )

 

-set RABBITMQ_PLUGINS_DIR="%~dp0..\plugins"

-set RABBITMQ_PLUGINS_EXPAND_DIR="%~dp0..\priv\plugins"

-set RABBITMQ_EBIN_DIR="%~dp0..\ebin"

+set RABBITMQ_PLUGINS_DIR=%~dp0..\plugins

+set RABBITMQ_PLUGINS_EXPAND_DIR=%~dp0..\priv\plugins

+set RABBITMQ_EBIN_DIR=%~dp0..\ebin

+

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

+-pa "%RABBITMQ_EBIN_DIR%" ^

+-noinput -hidden ^

+-s rabbit_plugin_activator ^

+-rabbit plugins_dir \""%RABBITMQ_PLUGINS_DIR:\=/%"\" ^

+-rabbit plugins_expand_dir \""%RABBITMQ_PLUGINS_EXPAND_DIR:\=/%"\" ^

+-rabbit rabbit_ebin  \""%RABBITMQ_EBIN_DIR:\=/%"\" ^

+-extra %*

 

-"%ERLANG_HOME%\bin\erl.exe" -pa "%~dp0..\ebin" -noinput -hidden -s rabbit_plugin_activator -rabbit plugins_dir \"%RABBITMQ_PLUGINS_DIR:\=/%\" -rabbit plugins_expand_dir \"%RABBITMQ_PLUGINS_EXPAND_DIR:\=/%\" -rabbit rabbit_ebin  \"%RABBITMQ_EBIN_DIR:\=/%\" -extra %*

+endlocal

diff --git a/scripts/rabbitmq-deactivate-plugins.bat b/scripts/rabbitmq-deactivate-plugins.bat
index 190fdef7b7..40155183a1 100644
--- a/scripts/rabbitmq-deactivate-plugins.bat
+++ b/scripts/rabbitmq-deactivate-plugins.bat
@@ -30,6 +30,10 @@ REM
 REM   Contributor(s): ______________________________________.

 REM

 

-set RABBITMQ_EBIN_DIR="%~dp0..\ebin"

+setlocal

 

-del /f %RABBITMQ_EBIN_DIR%\rabbit.rel %RABBITMQ_EBIN_DIR%\rabbit.script %RABBITMQ_EBIN_DIR%\rabbit.boot

+set RABBITMQ_EBIN_DIR=%~dp0..\ebin

+

+del /f "%RABBITMQ_EBIN_DIR%"\rabbit.rel "%RABBITMQ_EBIN_DIR%"\rabbit.script "%RABBITMQ_EBIN_DIR%"\rabbit.boot

+

+endlocal

diff --git a/scripts/rabbitmq-multi.bat b/scripts/rabbitmq-multi.bat
index 8abf13f192..8de18405b7 100755
--- a/scripts/rabbitmq-multi.bat
+++ b/scripts/rabbitmq-multi.bat
@@ -30,6 +30,8 @@ REM
 REM   Contributor(s): ______________________________________.

 REM

 

+setlocal

+

 if "%RABBITMQ_BASE%"=="" (

     set RABBITMQ_BASE=%APPDATA%\RabbitMQ

 )

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

 )

 

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

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

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

+-noinput -hidden ^

+%RABBITMQ_MULTI_ERL_ARGS% ^

+-sname rabbitmq_multi ^

+-s rabbit_multi ^

+%RABBITMQ_MULTI_START_ARGS% ^

+-extra %*

 

+endlocal

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 67768c0e86..34904850be 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -109,9 +109,7 @@ exec erl \
     -os_mon start_cpu_sup true \
     -os_mon start_disksup false \
     -os_mon start_memsup false \
-    -os_mon start_os_sup false \
-    -os_mon memsup_system_only true \
-    -os_mon system_memory_high_watermark 0.95 \
+    -os_mon vm_memory_high_watermark 0.4 \
     -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \
     ${RABBITMQ_CLUSTER_CONFIG_OPTION} \
     ${RABBITMQ_SERVER_START_ARGS} \
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 40f47c4b20..5b82ec1562 100755
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -30,6 +30,8 @@ REM
 REM   Contributor(s): ______________________________________.

 REM

 

+setlocal

+

 if "%RABBITMQ_BASE%"=="" (

     set RABBITMQ_BASE=%APPDATA%\RabbitMQ

 )

@@ -73,17 +75,17 @@ rem Log management (rotation, filtering based of size...) is left as an exercice
 

 set BACKUP_EXTENSION=.1

 

-set LOGS="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log"

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

+set LOGS=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log

+set SASL_LOGS=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log

 

-set LOGS_BACKUP="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log%BACKUP_EXTENSION%"

-set SASL_LOGS_BAKCUP="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log%BACKUP_EXTENSION%"

+set LOGS_BACKUP=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log%BACKUP_EXTENSION%

+set SASL_LOGS_BACKUP=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log%BACKUP_EXTENSION%

 

-if exist %LOGS% (

-    type %LOGS% >> %LOGS_BACKUP%

+if exist "%LOGS%" (

+    type "%LOGS%" >> "%LOGS_BACKUP%"

 )

-if exist %SASL_LOGS% (

-    type %SASL_LOGS% >> %SASL_LOGS_BAKCUP%

+if exist "%SASL_LOGS%" (

+    type "%SASL_LOGS%" >> "%SASL_LOGS_BACKUP%"

 )

 

 rem End of log management

@@ -103,26 +105,27 @@ if "%RABBITMQ_MNESIA_DIR%"=="" (
 set RABBITMQ_EBIN_ROOT=%~dp0..\ebin

 if exist "%RABBITMQ_EBIN_ROOT%\rabbit.boot" (

     echo Using Custom Boot File "%RABBITMQ_EBIN_ROOT%\rabbit.boot"

-    set RABBITMQ_BOOT_FILE="%RABBITMQ_EBIN_ROOT%\rabbit"

+    set RABBITMQ_BOOT_FILE=%RABBITMQ_EBIN_ROOT%\rabbit

     set RABBITMQ_EBIN_PATH=

 ) else (

     set RABBITMQ_BOOT_FILE=start_sasl

     set RABBITMQ_EBIN_PATH=-pa "%RABBITMQ_EBIN_ROOT%"

 )

 if "%RABBITMQ_CONFIG_FILE%"=="" (

-    set RABBITMQ_CONFIG_FILE="%RABBITMQ_BASE%\rabbitmq"

+    set RABBITMQ_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq

 )

    

 if exist "%RABBITMQ_CONFIG_FILE%.config" (

     set RABBITMQ_CONFIG_ARG=-config "%RABBITMQ_CONFIG_FILE%"

 ) else (

-    set RABBITMQ_CONFIG_ARG=""

+    set RABBITMQ_CONFIG_ARG=

 )

 

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

 %RABBITMQ_EBIN_PATH% ^

 -noinput ^

--boot %RABBITMQ_BOOT_FILE% %RABBITMQ_CONFIG_ARG% ^

+-boot "%RABBITMQ_BOOT_FILE%" ^

+%RABBITMQ_CONFIG_ARG% ^

 -sname %RABBITMQ_NODENAME% ^

 -s rabbit ^

 +W w ^

@@ -137,10 +140,10 @@ if exist "%RABBITMQ_CONFIG_FILE%.config" (
 -os_mon start_cpu_sup true ^

 -os_mon start_disksup false ^

 -os_mon start_memsup false ^

--os_mon start_os_sup false ^

--os_mon memsup_system_only true ^

--os_mon system_memory_high_watermark 0.95 ^

+-os_mon vm_memory_high_watermark 0.4 ^

 -mnesia dir \""%RABBITMQ_MNESIA_DIR%"\" ^

 %CLUSTER_CONFIG% ^

 %RABBITMQ_SERVER_START_ARGS% ^

 %*

+

+endlocal

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index 29be174284..0cc7bfa915 100755
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -30,6 +30,8 @@ REM
 REM   Contributor(s): ______________________________________.

 REM

 

+setlocal

+

 if "%RABBITMQ_SERVICENAME%"=="" (

     set RABBITMQ_SERVICENAME=RabbitMQ

 )

@@ -51,7 +53,7 @@ if "%RABBITMQ_NODE_PORT%"=="" (
 )

 

 if "%ERLANG_SERVICE_MANAGER_PATH%"=="" (

-    set ERLANG_SERVICE_MANAGER_PATH=C:\Program Files\erl5.5.5\erts-5.5.5\bin

+    set ERLANG_SERVICE_MANAGER_PATH=C:\Program Files\erl5.6.5\erts-5.6.5\bin

 )

 

 set CONSOLE_FLAG=

@@ -69,7 +71,7 @@ if not exist "%ERLANG_SERVICE_MANAGER_PATH%\erlsrv.exe" (
     echo ERLANG_SERVICE_MANAGER_PATH not set correctly. 

     echo **********************************************

     echo.

-    echo %ERLANG_SERVICE_MANAGER_PATH%\erlsrv.exe not found!

+    echo "%ERLANG_SERVICE_MANAGER_PATH%\erlsrv.exe" not found!

     echo Please set ERLANG_SERVICE_MANAGER_PATH to the folder containing "erlsrv.exe".

     echo.

     exit /B 1

@@ -91,17 +93,17 @@ rem Log management (rotation, filtering based on size...) is left as an exercise
 

 set BACKUP_EXTENSION=.1

 

-set LOGS="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log"

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

+set LOGS=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log

+set SASL_LOGS=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log

 

-set LOGS_BACKUP="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log%BACKUP_EXTENSION%"

-set SASL_LOGS_BACKUP="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log%BACKUP_EXTENSION%"

+set LOGS_BACKUP=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log%BACKUP_EXTENSION%

+set SASL_LOGS_BACKUP=%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log%BACKUP_EXTENSION%

 

-if exist %LOGS% (

-	type %LOGS% >> %LOGS_BACKUP%

+if exist "%LOGS%" (

+	type "%LOGS%" >> "%LOGS_BACKUP%"

 )

-if exist %SASL_LOGS% (

-	type %SASL_LOGS% >> %SASL_LOGS_BACKUP%

+if exist "%SASL_LOGS%" (

+	type "%SASL_LOGS%" >> "%SASL_LOGS_BACKUP%"

 )

 

 rem End of log management

@@ -173,9 +175,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 -os_mon start_cpu_sup true ^

 -os_mon start_disksup false ^

 -os_mon start_memsup false ^

--os_mon start_os_sup false ^

--os_mon memsup_system_only true ^

--os_mon system_memory_high_watermark 0.95 ^

+-os_mon vm_memory_high_watermark 0.4 ^

 -mnesia dir \""%RABBITMQ_MNESIA_DIR%"\" ^

 %CLUSTER_CONFIG% ^

 %RABBITMQ_SERVER_START_ARGS% ^

@@ -202,3 +202,5 @@ goto END
 

 

 :END

+

+endlocal

diff --git a/scripts/rabbitmqctl.bat b/scripts/rabbitmqctl.bat
index 8a4e5445e5..512e8587dc 100755
--- a/scripts/rabbitmqctl.bat
+++ b/scripts/rabbitmqctl.bat
@@ -30,6 +30,8 @@ REM
 REM   Contributor(s): ______________________________________.

 REM

 

+setlocal

+

 if "%RABBITMQ_NODENAME%"=="" (

     set RABBITMQ_NODENAME=rabbit

 )

@@ -47,3 +49,5 @@ if not exist "%ERLANG_HOME%\bin\erl.exe" (
 )

 

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

+

+endlocal