Merge branch 'stable'

3 files changed, 66 insertions, 0 deletions

diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 6397d1cdbd..d4033e7a3b 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -106,6 +106,7 @@ fi
 set -f
 
 start_rabbitmq_server() {
+    check_start_params &&
     RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
     exec ${ERL_DIR}erl \
         -pa ${RABBITMQ_EBIN_ROOT} \
@@ -137,6 +138,7 @@ start_rabbitmq_server() {
 }
 
 stop_rabbitmq_server() {
+    
     RABBITMQCTL="$(dirname "$0")/rabbitmqctl"
 
     if ${RABBITMQCTL} -n ${RABBITMQ_NODENAME} status >/dev/null 2>&1; then
@@ -144,6 +146,25 @@ stop_rabbitmq_server() {
     fi
 }
 
+check_start_params() {
+    check_not_empty RABBITMQ_BOOT_MODULE
+    check_not_empty RABBITMQ_NAME_TYPE
+    check_not_empty RABBITMQ_NODENAME
+    check_not_empty SASL_BOOT_FILE
+    check_not_empty RABBITMQ_IO_THREAD_POOL_SIZE
+}
+
+check_not_empty() {
+    local name="${1:?}"
+    local value
+    eval value=\$$name
+    if [ -z "$value" ]; then
+        echo "Error: ENV variable should be defined: $1. 
+       Please check rabbitmq-env, rabbitmq-defaults, and $CONF_ENV_FILE script files"
+        exit 78
+    fi
+}
+
 if [ 'x' = "x$RABBITMQ_ALLOW_INPUT" -a -z "$detached" ]; then
     # When RabbitMQ runs in the foreground but the Erlang shell is
     # disabled, we setup signal handlers to stop RabbitMQ properly. This
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 84908f380f..428f319bfa 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -92,6 +92,18 @@ if "!RABBITMQ_NODE_ONLY!"=="" (
 

 if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" (

     set RABBITMQ_IO_THREAD_POOL_ARG=30

+) else (

+    set RABBITMQ_IO_THREAD_POOL_ARG=!RABBITMQ_IO_THREAD_POOL_SIZE!

+)

+

+set ENV_OK=true

+CALL :check_not_empty "RABBITMQ_BOOT_MODULE" !RABBITMQ_BOOT_MODULE! 

+CALL :check_not_empty "RABBITMQ_NAME_TYPE" !RABBITMQ_NAME_TYPE!

+CALL :check_not_empty "RABBITMQ_NODENAME" !RABBITMQ_NODENAME!

+

+

+if "!ENV_OK!"=="false" (

+    EXIT /b 78

 )

 

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

@@ -122,5 +134,16 @@ if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" (
 !RABBITMQ_DIST_ARG! ^

 !STAR!

 

+EXIT /B 0

+

+:check_not_empty

+if "%~2"=="" (

+    ECHO "Error: ENV variable should be defined: %1. Please check rabbitmq-env and rabbitmq-defaults, and !RABBITMQ_CONF_ENV_FILE! script files. Check also your Environment Variables settings"

+    set ENV_OK=false

+    EXIT /B 78 

+    )

+EXIT /B 0

+

 endlocal

 endlocal

+

diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat
index a0168c5c93..762360bafc 100644
--- a/scripts/rabbitmq-service.bat
+++ b/scripts/rabbitmq-service.bat
@@ -104,6 +104,16 @@ if not exist "!RABBITMQ_BASE!" (
     echo Creating base directory !RABBITMQ_BASE! & md "!RABBITMQ_BASE!"

 )

 

+set ENV_OK=true

+CALL :check_not_empty "RABBITMQ_BOOT_MODULE" !RABBITMQ_BOOT_MODULE! 

+CALL :check_not_empty "RABBITMQ_NAME_TYPE" !RABBITMQ_NAME_TYPE!

+CALL :check_not_empty "RABBITMQ_NODENAME" !RABBITMQ_NODENAME!

+

+

+if "!ENV_OK!"=="false" (

+    EXIT /b 78

+)

+

 "!ERLANG_SERVICE_MANAGER_PATH!\erlsrv" list !RABBITMQ_SERVICENAME! 2>NUL 1>NUL

 if errorlevel 1 (

     "!ERLANG_SERVICE_MANAGER_PATH!\erlsrv" add !RABBITMQ_SERVICENAME! -internalservicename !RABBITMQ_SERVICENAME!

@@ -200,6 +210,8 @@ set ERLANG_SERVICE_ARGUMENTS= ^
 set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:\=\\!

 set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:"=\"!

 

+

+

 "!ERLANG_SERVICE_MANAGER_PATH!\erlsrv" set !RABBITMQ_SERVICENAME! ^

 -onfail !RABBITMQ_SERVICE_RESTART! ^

 -machine "!ERLANG_SERVICE_MANAGER_PATH!\erl.exe" ^

@@ -223,5 +235,15 @@ goto END
 

 :END

 

+EXIT /B 0

+

+:check_not_empty

+if "%~2"=="" (

+    ECHO "Error: ENV variable should be defined: %1. Please check rabbitmq-env, rabbitmq-default, and !RABBITMQ_CONF_ENV_FILE! script files. Check also your Environment Variables settings"

+    set ENV_OK=false

+    EXIT /B 78 

+    )

+EXIT /B 0

+

 endlocal

 endlocal