diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-01-29 16:10:44 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-03 15:34:02 +0000 |
| commit | 5101bbc65b8bd67ba856bf850dda50f2716d9f4d (patch) | |
| tree | 2ba0303cb5e12ae766b28b8c1f36a37d658fcc14 | |
| parent | 9bffa7957ecea99b9d3363a55f12d590c0af8bf9 (diff) | |
| download | rabbitmq-server-git-5101bbc65b8bd67ba856bf850dda50f2716d9f4d.tar.gz | |
Check env variables before start
| -rwxr-xr-x | scripts/rabbitmq-server | 21 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 16 |
2 files changed, 37 insertions, 0 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 548a085434..39d06dd4ca 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -113,6 +113,7 @@ fi set -f start_rabbitmq_server() { + check_start_params && RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \ exec ${ERL_DIR}erl \ -pa ${RABBITMQ_EBIN_ROOT} \ @@ -144,6 +145,8 @@ start_rabbitmq_server() { } stop_rabbitmq_server() { + check_start_params + RABBITMQCTL="$(dirname "$0")/rabbitmqctl" if ${RABBITMQCTL} -n ${RABBITMQ_NODENAME} status >/dev/null 2>&1; then @@ -151,6 +154,24 @@ stop_rabbitmq_server() { fi } +check_start_params() { + check_not_empty "RABBITMQ_BOOT_MODULE" $RABBITMQ_BOOT_MODULE + check_not_empty "RABBITMQ_NAME_TYPE" $RABBITMQ_NAME_TYPE + check_not_empty "RABBITMQ_NODENAME" $RABBITMQ_NODENAME + check_not_empty "SASL_BOOT_FILE" $SASL_BOOT_FILE + check_not_empty "RABBITMQ_IO_THREAD_POOL_SIZE" $RABBITMQ_IO_THREAD_POOL_SIZE +} + +check_not_empty() { + if [ "x" = "x$2" ]; then + echo "Error: ENV variable should be defined: $1. + Please check rabbitmq-env and rabbitmq-defaul script files" + exit 78 + else + echo "x$2" + 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 d80bb385d5..f45c161077 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -101,6 +101,21 @@ if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" ( set RABBITMQ_IO_THREAD_POOL_ARG=30
)
+
+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!"
+CALL :check_not_empty "SASL_BOOT_FILE" "!SASL_BOOT_FILE!"
+CALL :check_not_empty "RABBITMQ_IO_THREAD_POOL_SIZE" "!RABBITMQ_IO_THREAD_POOL_SIZE!"
+
+:check_not_empty
+if %2=="" (
+ ECHO "Error: ENV variable should be defined: !%1!.
+ Please check rabbitmq-env and rabbitmq-defaul script files"
+ EXIT /B 78
+ )
+EXIT /B 0
+
"!ERLANG_HOME!\bin\erl.exe" ^
-pa "!RABBITMQ_EBIN_ROOT!" ^
-boot start_sasl ^
@@ -131,3 +146,4 @@ if "!RABBITMQ_IO_THREAD_POOL_SIZE!"=="" ( endlocal
endlocal
+
|