diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-22 11:15:40 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-02-22 11:15:40 +0000 |
| commit | d937467ee05b0eef81f3ba2b4d420cbc3df98f50 (patch) | |
| tree | 2e70c23c4f2f16943971942233289dad52d7c87f /scripts | |
| parent | 173260d91e1f10ba0e5ef2cd16889ccd5bb28dab (diff) | |
| download | rabbitmq-server-git-d937467ee05b0eef81f3ba2b4d420cbc3df98f50.tar.gz | |
Config location logging
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rabbitmq-defaults | 2 | ||||
| -rw-r--r-- | scripts/rabbitmq-defaults.bat | 2 | ||||
| -rw-r--r-- | scripts/rabbitmq-env | 1 | ||||
| -rw-r--r-- | scripts/rabbitmq-env.bat | 8 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 1 |
5 files changed, 12 insertions, 2 deletions
diff --git a/scripts/rabbitmq-defaults b/scripts/rabbitmq-defaults index b102b3619c..23b5a4afd0 100644 --- a/scripts/rabbitmq-defaults +++ b/scripts/rabbitmq-defaults @@ -39,7 +39,7 @@ LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins GENERATED_CONFIG_DIR=${SYS_PREFIX}/var/lib/rabbitmq/config -RABBITMQ_CONFIG_ADVANCED=${SYS_PREFIX}/etc/rabbitmq/advanced +CONFIG_ADVANCED=${SYS_PREFIX}/etc/rabbitmq/advanced PLUGINS_DIR="${RABBITMQ_HOME}/plugins" IO_THREAD_POOL_SIZE=64 diff --git a/scripts/rabbitmq-defaults.bat b/scripts/rabbitmq-defaults.bat index 7c351bf48a..0ca53013a9 100644 --- a/scripts/rabbitmq-defaults.bat +++ b/scripts/rabbitmq-defaults.bat @@ -42,7 +42,7 @@ set LOG_BASE=!RABBITMQ_BASE!\log set MNESIA_BASE=!RABBITMQ_BASE!\db
set ENABLED_PLUGINS_FILE=!RABBITMQ_BASE!\enabled_plugins
set GENERATED_CONFIG_DIR=!RABBITMQ_BASE!\config
-set RABBITMQ_CONFIG_ADVANCED=!RABBITMQ_BASE!\advanced
+set CONFIG_ADVANCED=!RABBITMQ_BASE!\advanced
REM PLUGINS_DIR="${RABBITMQ_HOME}/plugins"
for /f "delims=" %%F in ("!TDP0!..\plugins") do set PLUGINS_DIR=%%~dpsF%%~nF%%~xF
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index a360631a19..8261053a6d 100644 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -185,6 +185,7 @@ DEFAULT_NODE_PORT=5672 [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR} [ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME} [ "x" = "x$RABBITMQ_GENERATED_CONFIG_DIR" ] && RABBITMQ_GENERATED_CONFIG_DIR=${GENERATED_CONFIG_DIR} +[ "x" = "x$RABBITMQ_CONFIG_ADVANCED" ] && RABBITMQ_CONFIG_ADVANCED=${CONFIG_ADVANCED} rmq_normalize_path_var \ RABBITMQ_CONFIG_FILE \ diff --git a/scripts/rabbitmq-env.bat b/scripts/rabbitmq-env.bat index ee89ac5605..b7a5bb7e52 100644 --- a/scripts/rabbitmq-env.bat +++ b/scripts/rabbitmq-env.bat @@ -166,6 +166,14 @@ if "!RABBITMQ_GENERATED_CONFIG_DIR!"=="" ( )
)
+if "!RABBITMQ_CONFIG_ADVANCED!"=="" (
+ if "!CONFIG_ADVANCED!"=="" (
+ set RABBITMQ_CONFIG_ADVANCED=!RABBITMQ_BASE!\advanced
+ ) else (
+ set RABBITMQ_CONFIG_ADVANCED=!GENERATED_CONFIG_DIR!
+ )
+)
+
REM [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}
if "!RABBITMQ_LOG_BASE!"=="" (
if "!LOG_BASE!"=="" (
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 236bcea561..3b1ecb8af2 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -95,6 +95,7 @@ elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \ -conf_script_dir `dirname $0` \ -conf_schema_dir ${RABBITMQ_HOME}/priv/schema" + echo "${RABBITMQ_CONFIG_ADVANCED}.config" if [ -f "${RABBITMQ_CONFIG_ADVANCED}.config" ]; then RABBITMQ_CONFIG_ARG="${RABBITMQ_CONFIG_ARG} \ -conf_advanced ${RABBITMQ_CONFIG_ADVANCED} \ |