diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-04 17:09:48 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-03-04 17:09:48 +0000 |
| commit | 4596ca25a2e2f9652a2ac2a5e3f2458dbb508fd9 (patch) | |
| tree | 5ed0359665d3162372c24c40f57be06c2817dbb3 | |
| parent | 6cf3097e9f99f9293bac718aaea03b595270d57f (diff) | |
| download | rabbitmq-server-git-4596ca25a2e2f9652a2ac2a5e3f2458dbb508fd9.tar.gz | |
mention RABBITMQ_CONF_ENV_FILE
| -rwxr-xr-x | scripts/rabbitmq-server | 17 | ||||
| -rw-r--r-- | scripts/rabbitmq-server.bat | 2 | ||||
| -rw-r--r-- | scripts/rabbitmq-service.bat | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 39d06dd4ca..dcb66e784a 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -155,17 +155,20 @@ stop_rabbitmq_server() { } 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 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() { - if [ "x" = "x$2" ]; then + local name="${1:?}" + local value + eval value=\$$name + if [ -z "$value" ]; then echo "Error: ENV variable should be defined: $1. - Please check rabbitmq-env and rabbitmq-defaul script files" + Please check rabbitmq-env, rabbitmq-defaults, and $CONF_ENV_FILE script files" exit 78 else echo "x$2" diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index be09e8bd54..1c94e178d7 100644 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -145,7 +145,7 @@ EXIT /B 0 :check_not_empty
if %2=="" (
- ECHO "Error: ENV variable should be defined: %1. Please check rabbitmq-env and rabbitmq-defaul script files"
+ ECHO "Error: ENV variable should be defined: %1. Please check rabbitmq-env and rabbitmq-defaults, and !RABBITMQ_CONF_ENV_FILE! script files"
set ENV_OK=false
EXIT /B 78
)
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 565b05bab5..6ad91abcca 100644 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -225,7 +225,7 @@ EXIT /B 0 :check_not_empty
if %2=="" (
- ECHO "Error: ENV variable should be defined: %1. Please check rabbitmq-env and rabbitmq-defaul script files"
+ ECHO "Error: ENV variable should be defined: %1. Please check rabbitmq-env, rabbitmq-default, and !RABBITMQ_CONF_ENV_FILE! script files"
set ENV_OK=false
EXIT /B 78
)
|