merging default into bug 22169

1 files changed, 62 insertions, 55 deletions

diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 5110285128..28eb8ebb8d 100755..100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -19,11 +19,11 @@ REM   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
 REM   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial

 REM   Technologies LLC, and Rabbit Technologies Ltd.

 REM

-REM   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift

+REM   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift

 REM   Ltd. Portions created by Cohesive Financial Technologies LLC are

-REM   Copyright (C) 2007-2009 Cohesive Financial Technologies

+REM   Copyright (C) 2007-2010 Cohesive Financial Technologies

 REM   LLC. Portions created by Rabbit Technologies Ltd are Copyright

-REM   (C) 2007-2009 Rabbit Technologies Ltd.

+REM   (C) 2007-2010 Rabbit Technologies Ltd.

 REM

 REM   All Rights Reserved.

 REM

@@ -32,25 +32,31 @@ REM
 

 setlocal

 

-if "%RABBITMQ_BASE%"=="" (

-    set RABBITMQ_BASE=%APPDATA%\RabbitMQ

+rem Preserve values that might contain exclamation marks before

+rem enabling delayed expansion

+set TDP0=%~dp0

+set STAR=%*

+setlocal enabledelayedexpansion

+

+if "!RABBITMQ_BASE!"=="" (

+    set RABBITMQ_BASE=!APPDATA!\RabbitMQ

 )

 

-if "%RABBITMQ_NODENAME%"=="" (

+if "!RABBITMQ_NODENAME!"=="" (

     set RABBITMQ_NODENAME=rabbit

 )

 

-if "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-   if not "%RABBITMQ_NODE_PORT%"=="" (

+if "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

+   if not "!RABBITMQ_NODE_PORT!"=="" (

       set RABBITMQ_NODE_IP_ADDRESS=0.0.0.0

    )

 ) else (

-   if "%RABBITMQ_NODE_PORT%"=="" (

+   if "!RABBITMQ_NODE_PORT!"=="" (

       set RABBITMQ_NODE_PORT=5672

    )

 )

 

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

+if not exist "!ERLANG_HOME!\bin\erl.exe" (

     echo.

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

     echo ERLANG_HOME not set correctly.

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

 )

 

-set RABBITMQ_BASE_UNIX=%RABBITMQ_BASE:\=/%

+set RABBITMQ_BASE_UNIX=!RABBITMQ_BASE:\=/!

 

-if "%RABBITMQ_MNESIA_BASE%"=="" (

-    set RABBITMQ_MNESIA_BASE=%RABBITMQ_BASE_UNIX%/db

+if "!RABBITMQ_MNESIA_BASE!"=="" (

+    set RABBITMQ_MNESIA_BASE=!RABBITMQ_BASE_UNIX!/db

 )

-if "%RABBITMQ_LOG_BASE%"=="" (

-    set RABBITMQ_LOG_BASE=%RABBITMQ_BASE_UNIX%/log

+if "!RABBITMQ_LOG_BASE!"=="" (

+    set RABBITMQ_LOG_BASE=!RABBITMQ_BASE_UNIX!/log

 )

 

 

@@ -77,81 +83,82 @@ 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_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

 

 

-if "%RABBITMQ_CLUSTER_CONFIG_FILE%"=="" (

-    set RABBITMQ_CLUSTER_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq_cluster.config

+if "!RABBITMQ_CLUSTER_CONFIG_FILE!"=="" (

+    set RABBITMQ_CLUSTER_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq_cluster.config

 )

 set CLUSTER_CONFIG=

-if not exist "%RABBITMQ_CLUSTER_CONFIG_FILE%" GOTO L1

-set CLUSTER_CONFIG=-rabbit cluster_config \""%RABBITMQ_CLUSTER_CONFIG_FILE:\=/%"\"

+if not exist "!RABBITMQ_CLUSTER_CONFIG_FILE!" GOTO L1

+set CLUSTER_CONFIG=-rabbit cluster_config \""!RABBITMQ_CLUSTER_CONFIG_FILE:\=/!"\"

 :L1

 

-if "%RABBITMQ_MNESIA_DIR%"=="" (

-    set RABBITMQ_MNESIA_DIR=%RABBITMQ_MNESIA_BASE%/%RABBITMQ_NODENAME%-mnesia

+if "!RABBITMQ_MNESIA_DIR!"=="" (

+    set RABBITMQ_MNESIA_DIR=!RABBITMQ_MNESIA_BASE!/!RABBITMQ_NODENAME!-mnesia

 )

-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_EBIN_ROOT=!TDP0!..\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_EBIN_PATH=

 ) else (

     set RABBITMQ_BOOT_FILE=start_sasl

-    set RABBITMQ_EBIN_PATH=-pa "%RABBITMQ_EBIN_ROOT%"

+    set RABBITMQ_EBIN_PATH=-pa "!RABBITMQ_EBIN_ROOT!"

 )

-if "%RABBITMQ_CONFIG_FILE%"=="" (

-    set RABBITMQ_CONFIG_FILE=%RABBITMQ_BASE%\rabbitmq

+if "!RABBITMQ_CONFIG_FILE!"=="" (

+    set RABBITMQ_CONFIG_FILE=!RABBITMQ_BASE!\rabbitmq

 )

 

-if exist "%RABBITMQ_CONFIG_FILE%.config" (

-    set RABBITMQ_CONFIG_ARG=-config "%RABBITMQ_CONFIG_FILE%"

+if exist "!RABBITMQ_CONFIG_FILE!.config" (

+    set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"

 ) else (

     set RABBITMQ_CONFIG_ARG=

 )

 

 set RABBITMQ_LISTEN_ARG=

-if not "%RABBITMQ_NODE_IP_ADDRESS%"=="" (

-   if not "%RABBITMQ_NODE_PORT%"=="" (

-      set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners [{\""%RABBITMQ_NODE_IP_ADDRESS%"\","%RABBITMQ_NODE_PORT%"}]

+if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (

+   if not "!RABBITMQ_NODE_PORT!"=="" (

+      set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners [{\""!RABBITMQ_NODE_IP_ADDRESS!"\","!RABBITMQ_NODE_PORT!"}]

    )

 )

 

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

-%RABBITMQ_EBIN_PATH% ^

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

+!RABBITMQ_EBIN_PATH! ^

 -noinput ^

--boot "%RABBITMQ_BOOT_FILE%" ^

-%RABBITMQ_CONFIG_ARG% ^

--sname %RABBITMQ_NODENAME% ^

+-boot "!RABBITMQ_BOOT_FILE!" ^

+!RABBITMQ_CONFIG_ARG! ^

+-sname !RABBITMQ_NODENAME! ^

 -s rabbit ^

 +W w ^

 +A30 ^

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

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

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

-%RABBITMQ_LISTEN_ARG% ^

--kernel error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%.log"\"} ^

-%RABBITMQ_SERVER_ERL_ARGS% ^

+!RABBITMQ_LISTEN_ARG! ^

+-kernel error_logger {file,\""!RABBITMQ_LOG_BASE!/!RABBITMQ_NODENAME!.log"\"} ^

+!RABBITMQ_SERVER_ERL_ARGS! ^

 -sasl errlog_type error ^

--sasl sasl_error_logger {file,\""%RABBITMQ_LOG_BASE%/%RABBITMQ_NODENAME%-sasl.log"\"} ^

+-sasl sasl_error_logger {file,\""!RABBITMQ_LOG_BASE!/!RABBITMQ_NODENAME!-sasl.log"\"} ^

 -os_mon start_cpu_sup true ^

 -os_mon start_disksup false ^

 -os_mon start_memsup false ^

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

-%CLUSTER_CONFIG% ^

-%RABBITMQ_SERVER_START_ARGS% ^

-%*

+-mnesia dir \""!RABBITMQ_MNESIA_DIR!"\" ^

+!CLUSTER_CONFIG! ^

+!RABBITMQ_SERVER_START_ARGS! ^

+!STAR!

 

 endlocal

+endlocal