diff options
| author | Gabriele Santomaggio <gabriele.santomaggio@erlang-solutions.com> | 2016-03-08 17:51:55 +0100 |
|---|---|---|
| committer | Gabriele Santomaggio <gabriele.santomaggio@erlang-solutions.com> | 2016-03-08 17:51:55 +0100 |
| commit | fa3d8290f079e4eb3ae150c4486fd6427d2f9008 (patch) | |
| tree | 6505d9ca40d18650c5e54fcf43a6145263e5f623 /scripts/rabbitmq-service.bat | |
| parent | da4eb948c30589c4685152466adb33af4457b230 (diff) | |
| download | rabbitmq-server-git-fa3d8290f079e4eb3ae150c4486fd6427d2f9008.tar.gz | |
moved check_not_empty controls, removed double quotes
Diffstat (limited to 'scripts/rabbitmq-service.bat')
| -rw-r--r-- | scripts/rabbitmq-service.bat | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 6ad91abcca..a7ef439b65 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!
@@ -188,15 +198,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^ set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:\=\\!
set ERLANG_SERVICE_ARGUMENTS=!ERLANG_SERVICE_ARGUMENTS:"=\"!
-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" set !RABBITMQ_SERVICENAME! ^
-onfail !RABBITMQ_SERVICE_RESTART! ^
@@ -225,7 +227,7 @@ 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"
+ 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
)
|