Skip to content

Commit 526ec37

Browse files
michaelklishinmichaelklishin
authored
Merge pull request #1671 from rabbitmq/config_files_check
Config files check
2 parents 79f943a + 34bba9b commit 526ec37

9 files changed

+399
-174
lines changed

‎scripts/rabbitmq-defaults

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ LOG_BASE=${SYS_PREFIX}/var/log/rabbitmq
3939
MNESIA_BASE=${SYS_PREFIX}/var/lib/rabbitmq/mnesia
4040
ENABLED_PLUGINS_FILE=${SYS_PREFIX}/etc/rabbitmq/enabled_plugins
4141
GENERATED_CONFIG_DIR=${SYS_PREFIX}/var/lib/rabbitmq/config
42-
ADVANCED_CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/advanced
42+
ADVANCED_CONFIG_FILE=${SYS_PREFIX}/etc/rabbitmq/advanced.config
4343
SCHEMA_DIR=${SYS_PREFIX}/var/lib/rabbitmq/schema
4444

4545
PLUGINS_DIR="${RABBITMQ_HOME}/plugins"

‎scripts/rabbitmq-defaults.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ set LOG_BASE=!RABBITMQ_BASE!\log
4242
set MNESIA_BASE=!RABBITMQ_BASE!\db
4343
set ENABLED_PLUGINS_FILE=!RABBITMQ_BASE!\enabled_plugins
4444
set GENERATED_CONFIG_DIR=!RABBITMQ_BASE!\config
45-
set ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced
45+
set ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced.config
4646
set SCHEMA_DIR=!RABBITMQ_BASE!\schema
4747

4848
REM PLUGINS_DIR="${RABBITMQ_HOME}/plugins"

‎scripts/rabbitmq-env.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ if "!RABBITMQ_GENERATED_CONFIG_DIR!"=="" (
194194
CALL :unquote RABBITMQ_ADVANCED_CONFIG_FILE %RABBITMQ_ADVANCED_CONFIG_FILE%
195195
if "!RABBITMQ_ADVANCED_CONFIG_FILE!"=="" (
196196
if "!ADVANCED_CONFIG_FILE!"=="" (
197-
set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced
197+
set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_BASE!\advanced.config
198198
) else (
199199
set RABBITMQ_ADVANCED_CONFIG_FILE=!ADVANCED_CONFIG_FILE!
200200
)

‎scripts/rabbitmq-server

Lines changed: 109 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,117 @@ RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin"
6262

6363
[ "$NOTIFY_SOCKET" ] && RUNNING_UNDER_SYSTEMD=true
6464

65-
set +e
65+
if [ ! -d ${RABBITMQ_SCHEMA_DIR} ]; then
66+
mkdir -p "${RABBITMQ_SCHEMA_DIR}"
67+
fi
68+
69+
if [ ! -d ${RABBITMQ_GENERATED_CONFIG_DIR} ]; then
70+
mkdir -p "${RABBITMQ_GENERATED_CONFIG_DIR}"
71+
fi
72+
73+
if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbit.schema" ]; then
74+
cp "${RABBITMQ_HOME}/priv/schema/rabbit.schema" "${RABBITMQ_SCHEMA_DIR}"
75+
fi
76+
77+
get_noex() {
78+
if [ "x" = "x${1}" ]; then
79+
echo ""
80+
else
81+
local BASENAME=$(basename $1)
82+
local DIRNAME=$(dirname $1)
83+
if [ "x." = "x${DIRNAME}" ]; then
84+
echo "${BASENAME%.*}"
85+
else
86+
echo "${DIRNAME}/${BASENAME%.*}"
87+
fi
88+
fi
89+
}
90+
91+
# Check that advanced config file has the .config extension
92+
# Add .config extension if it's empty
93+
94+
RABBITMQ_ADVANCED_CONFIG_FILE_NOEX=$(get_noex ${RABBITMQ_ADVANCED_CONFIG_FILE})
95+
if [ "${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX}.config" = "${RABBITMQ_ADVANCED_CONFIG_FILE}" \
96+
-o "${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX}" = "${RABBITMQ_ADVANCED_CONFIG_FILE}" ]; then
97+
RABBITMQ_ADVANCED_CONFIG_FILE="${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX}.config"
98+
fi
99+
100+
101+
RABBITMQ_CONFIG_FILE_NOEX=$(get_noex ${RABBITMQ_CONFIG_FILE})
102+
# Extension is not specified.
103+
# Determine config type from file
104+
105+
if [ "${RABBITMQ_CONFIG_FILE_NOEX}" = "${RABBITMQ_CONFIG_FILE}" ]; then
106+
if [ -f "${RABBITMQ_CONFIG_FILE_NOEX}.config" ]; then
107+
if [ -f "${RABBITMQ_CONFIG_FILE_NOEX}.conf" ]; then
108+
# Both files exist. Print a warning
109+
echo "WARNING: Both old (.config) and new (.conf) format config files exist."
110+
echo "WARNING: Using the old format config file: ${RABBITMQ_CONFIG_FILE_NOEX}.config"
111+
echo "WARNING: Please update your config files to the new format and remove the old file"
112+
fi
113+
RABBITMQ_CONFIG_FILE="${RABBITMQ_CONFIG_FILE_NOEX}.config"
114+
elif [ -f "${RABBITMQ_CONFIG_FILE_NOEX}.conf" ]; then
115+
RABBITMQ_CONFIG_FILE="${RABBITMQ_CONFIG_FILE_NOEX}.conf"
116+
else
117+
if [ -f ${RABBITMQ_ADVANCED_CONFIG_FILE} ]; then
118+
echo "WARNING: Using RABBITMQ_ADVANCED_CONFIG_FILE: ${RABBITMQ_ADVANCED_CONFIG_FILE}"
119+
fi
120+
# No config file exist. Use advanced config for -config arg.
121+
RABBITMQ_CONFIG_ARG_FILE="${RABBITMQ_ADVANCED_CONFIG_FILE}"
122+
RABBITMQ_CONFIG_FILE=""
123+
fi
124+
fi
125+
126+
# Set the -config argument.
127+
# The -config argument should not have extension.
128+
# the file should exist
129+
# the file should be a valid erlang term file
130+
131+
# Config file extension is .config
132+
if [ "${RABBITMQ_CONFIG_FILE_NOEX}.config" = "${RABBITMQ_CONFIG_FILE}" ]; then
133+
RABBITMQ_CONFIG_ARG_FILE="${RABBITMQ_CONFIG_FILE}"
134+
# Config file extension is .conf
135+
elif [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" = "${RABBITMQ_CONFIG_FILE}" ]; then
136+
RABBITMQ_CONFIG_ARG_FILE="${RABBITMQ_ADVANCED_CONFIG_FILE}"
137+
elif [ "x" != "x${RABBITMQ_CONFIG_FILE}" \
138+
-a "${RABBITMQ_CONFIG_FILE_NOEX}" != "${RABBITMQ_CONFIG_FILE}" ]; then
139+
# Config file has an extension, but it's neither .conf or .config
140+
echo "ERROR: Wrong extension for RABBITMQ_CONFIG_FILE: ${RABBITMQ_CONFIG_FILE}"
141+
echo "ERROR: extension should be either .conf or .config"
142+
exit 1
143+
fi
144+
145+
RABBITMQ_CONFIG_ARG_FILE_NOEX=$(get_noex ${RABBITMQ_CONFIG_ARG_FILE})
146+
147+
if [ "${RABBITMQ_CONFIG_ARG_FILE_NOEX}.config" != "${RABBITMQ_CONFIG_ARG_FILE}" ]; then
148+
if [ "${RABBITMQ_CONFIG_ARG_FILE}" = "${RABBITMQ_ADVANCED_CONFIG_FILE}" ]; then
149+
echo "ERROR: Wrong extension for RABBITMQ_ADVANCED_CONFIG_FILE: ${RABBITMQ_ADVANCED_CONFIG_FILE}"
150+
echo "ERROR: extension should be .config"
151+
exit 1
152+
else
153+
# We should never got here, but still there should be some explanation
154+
echo "ERROR: Wrong extension for ${RABBITMQ_CONFIG_ARG_FILE}"
155+
echo "ERROR: extension should be .config"
156+
exit 1
157+
fi
158+
fi
66159

67-
RABBITMQ_ADVANCED_CONFIG_FILE_NOEX="${RABBITMQ_ADVANCED_CONFIG_FILE%.*}"
68-
if [ "${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX}.config" = "${RABBITMQ_ADVANCED_CONFIG_FILE}" ]; then
69-
RABBITMQ_ADVANCED_CONFIG_FILE="${RABBITMQ_ADVANCED_CONFIG_FILE_NOEX}"
160+
# Set -config if the file exists
161+
if [ -f "${RABBITMQ_CONFIG_ARG_FILE}" ]; then
162+
RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_ARG_FILE_NOEX}"
70163
fi
71164

165+
# Set -conf and other generated config parameters
166+
if [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" = "${RABBITMQ_CONFIG_FILE}" ]; then
167+
RABBITMQ_GENERATED_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} \
168+
-conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \
169+
-conf_script_dir `dirname $0` \
170+
-conf_schema_dir ${RABBITMQ_SCHEMA_DIR}
171+
-conf_advanced ${RABBITMQ_ADVANCED_CONFIG_FILE}"
172+
fi
173+
174+
set +e
175+
72176
# `net_kernel:start/1` will fail in `longnames` mode when erlang is
73177
# unable to determine FQDN of a node (with a dot in it). But `erl`
74178
# itself has some magic that still allow it to start when you
@@ -108,18 +212,6 @@ else
108212
exit ${PRELAUNCH_RESULT}
109213
fi
110214

111-
if [ ! -d ${RABBITMQ_SCHEMA_DIR} ]; then
112-
mkdir -p "${RABBITMQ_SCHEMA_DIR}"
113-
fi
114-
115-
if [ ! -d ${RABBITMQ_GENERATED_CONFIG_DIR} ]; then
116-
mkdir -p "${RABBITMQ_GENERATED_CONFIG_DIR}"
117-
fi
118-
119-
if [ ! -f "${RABBITMQ_SCHEMA_DIR}/rabbit.schema" ]; then
120-
cp "${RABBITMQ_HOME}/priv/schema/rabbit.schema" "${RABBITMQ_SCHEMA_DIR}"
121-
fi
122-
123215
# The default allocation strategy RabbitMQ is using was introduced
124216
# in Erlang/OTP 20.2.3. Earlier Erlang versions fail to start with
125217
# this configuration. We therefore need to ensure that erl accepts
@@ -141,38 +233,6 @@ fi
141233

142234
set -e
143235

144-
RABBITMQ_CONFIG_FILE_NOEX="${RABBITMQ_CONFIG_FILE%.*}"
145-
146-
if [ "${RABBITMQ_CONFIG_FILE_NOEX}.config" = "${RABBITMQ_CONFIG_FILE}" ]; then
147-
if [ -f "${RABBITMQ_CONFIG_FILE}" ]; then
148-
RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE_NOEX}"
149-
fi
150-
elif [ "${RABBITMQ_CONFIG_FILE_NOEX}.conf" = "${RABBITMQ_CONFIG_FILE}" ]; then
151-
RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE_NOEX} \
152-
-conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \
153-
-conf_script_dir `dirname $0` \
154-
-conf_schema_dir ${RABBITMQ_SCHEMA_DIR}"
155-
if [ -f "${RABBITMQ_ADVANCED_CONFIG_FILE}.config" ]; then
156-
RABBITMQ_CONFIG_ARG="${RABBITMQ_CONFIG_ARG} \
157-
-conf_advanced ${RABBITMQ_ADVANCED_CONFIG_FILE} \
158-
-config ${RABBITMQ_ADVANCED_CONFIG_FILE}"
159-
fi
160-
else
161-
if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then
162-
RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}"
163-
elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then
164-
RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} \
165-
-conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} \
166-
-conf_script_dir `dirname $0` \
167-
-conf_schema_dir ${RABBITMQ_SCHEMA_DIR}"
168-
if [ -f "${RABBITMQ_ADVANCED_CONFIG_FILE}.config" ]; then
169-
RABBITMQ_CONFIG_ARG="${RABBITMQ_CONFIG_ARG} \
170-
-conf_advanced ${RABBITMQ_ADVANCED_CONFIG_FILE} \
171-
-config ${RABBITMQ_ADVANCED_CONFIG_FILE}"
172-
fi
173-
fi
174-
fi
175-
176236
RABBITMQ_LISTEN_ARG=
177237
[ "x" != "x$RABBITMQ_NODE_PORT" ] && [ "x" != "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_LISTEN_ARG="-rabbit tcp_listeners [{\""${RABBITMQ_NODE_IP_ADDRESS}"\","${RABBITMQ_NODE_PORT}"}]"
178238

@@ -230,6 +290,7 @@ start_rabbitmq_server() {
230290
${RABBITMQ_NAME_TYPE} ${RABBITMQ_NODENAME} \
231291
-boot "${SASL_BOOT_FILE}" \
232292
${RABBITMQ_CONFIG_ARG} \
293+
${RABBITMQ_GENERATED_CONFIG_ARG} \
233294
+W w \
234295
+A ${RABBITMQ_IO_THREAD_POOL_SIZE} \
235296
${RABBITMQ_DEFAULT_ALLOC_ARGS} \

‎scripts/rabbitmq-server.bat

Lines changed: 92 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,97 @@ if not exist "!ERLANG_HOME!\bin\erl.exe" (
4848

4949
set RABBITMQ_EBIN_ROOT=!RABBITMQ_HOME!\ebin
5050

51+
if not exist "!RABBITMQ_SCHEMA_DIR!" (
52+
mkdir "!RABBITMQ_SCHEMA_DIR!"
53+
)
54+
55+
if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" (
56+
mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"
57+
)
58+
59+
if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (
60+
copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"
61+
)
62+
5163
CALL :get_noex !RABBITMQ_ADVANCED_CONFIG_FILE! RABBITMQ_ADVANCED_CONFIG_FILE_NOEX
52-
if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.config" (
53-
set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!
64+
65+
if "!RABBITMQ_ADVANCED_CONFIG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!" (
66+
set RABBITMQ_ADVANCED_CONFIG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE_NOEX!.config
67+
REM Try to create advanced config file, if it doesn't exist
68+
REM It still can fail to be created, but at least not for default install
69+
if not exist "!RABBITMQ_ADVANCED_CONFIG_FILE!" (
70+
echo []. > !RABBITMQ_ADVANCED_CONFIG_FILE!
71+
)
72+
)
73+
74+
CALL :get_noex !RABBITMQ_CONFIG_FILE! RABBITMQ_CONFIG_FILE_NOEX
75+
76+
if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!" (
77+
if exist "!RABBITMQ_CONFIG_FILE_NOEX!.config" (
78+
if exist "!RABBITMQ_CONFIG_FILE_NOEX!.conf" (
79+
rem Both files exist. Print a warning
80+
echo "WARNING: Both old (.config) and new (.conf) format config files exist."
81+
echo "WARNING: Using the old format config file: !RABBITMQ_CONFIG_FILE_NOEX!.config"
82+
echo "WARNING: Please update your config files to the new format and remove the old file"
83+
)
84+
set RABBITMQ_CONFIG_FILE=!RABBITMQ_CONFIG_FILE_NOEX!.config
85+
) else if exist "!RABBITMQ_CONFIG_FILE_NOEX!.conf" (
86+
set RABBITMQ_CONFIG_FILE=!RABBITMQ_CONFIG_FILE_NOEX!.conf
87+
) else (
88+
rem No config file exist. Use advanced config for -config arg.
89+
if exist "!RABBITMQ_ADVANCED_CONFIG_FILE!" (
90+
echo "WARNING: Using RABBITMQ_ADVANCED_CONFIG_FILE: !RABBITMQ_ADVANCED_CONFIG_FILE!"
91+
)
92+
set RABBITMQ_CONFIG_ARG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE!
93+
)
94+
)
95+
96+
rem Set the -config argument.
97+
rem The -config argument should not have extension.
98+
rem the file should exist
99+
rem the file should be a valid erlang term file
100+
101+
rem Config file extension is .config
102+
if "!RABBITMQ_CONFIG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_FILE!" (
103+
set RABBITMQ_CONFIG_ARG_FILE=!RABBITMQ_CONFIG_FILE!
104+
) else if "!RABBITMQ_CONFIG_FILE_NOEX!.conf" == "!RABBITMQ_CONFIG_FILE!" (
105+
set RABBITMQ_CONFIG_ARG_FILE=!RABBITMQ_ADVANCED_CONFIG_FILE!
106+
) else if not "" == "!RABBITMQ_CONFIG_FILE!" (
107+
if not "!RABBITMQ_CONFIG_FILE_NOEX!" == "!RABBITMQ_CONFIG_FILE!" (
108+
rem Config file has an extension, but it's neither .conf or .config
109+
echo "ERROR: Wrong extension for RABBITMQ_CONFIG_FILE: !RABBITMQ_CONFIG_FILE!"
110+
echo "ERROR: extension should be either .conf or .config"
111+
exit /B 1
112+
)
113+
)
114+
115+
CALL :get_noex !RABBITMQ_CONFIG_ARG_FILE! RABBITMQ_CONFIG_ARG_FILE_NOEX
116+
117+
if not "!RABBITMQ_CONFIG_ARG_FILE_NOEX!.config" == "!RABBITMQ_CONFIG_ARG_FILE!" (
118+
if "!RABBITMQ_CONFIG_ARG_FILE!" == "!RABBITMQ_ADVANCED_CONFIG_FILE!" (
119+
echo "ERROR: Wrong extension for RABBITMQ_ADVANCED_CONFIG_FILE: !RABBITMQ_ADVANCED_CONFIG_FILE!"
120+
echo "ERROR: extension should be .config"
121+
exit /B 1
122+
) else (
123+
rem We should never got here, but still there should be some explanation
124+
echo "ERROR: Wrong extension for !RABBITMQ_CONFIG_ARG_FILE!"
125+
echo "ERROR: extension should be .config"
126+
exit /B 1
127+
)
128+
)
129+
130+
rem Set -config if the file exists
131+
if exist !RABBITMQ_CONFIG_ARG_FILE! (
132+
set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_ARG_FILE_NOEX!"
133+
)
134+
135+
rem Set -conf and other generated config parameters
136+
if "!RABBITMQ_CONFIG_FILE_NOEX!.conf" == "!RABBITMQ_CONFIG_FILE!" (
137+
set RABBITMQ_GENERATED_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^
138+
-conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
139+
-conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
140+
-conf_schema_dir "!RABBITMQ_SCHEMA_DIR!" ^
141+
-conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!"
54142
)
55143

56144
"!ERLANG_HOME!\bin\erl.exe" ^
@@ -93,60 +181,16 @@ if ERRORLEVEL 1 (
93181
set RABBITMQ_DEFAULT_ALLOC_ARGS=
94182
)
95183

96-
if not exist "!RABBITMQ_SCHEMA_DIR!" (
97-
mkdir "!RABBITMQ_SCHEMA_DIR!"
98-
)
99-
100-
if not exist "!RABBITMQ_GENERATED_CONFIG_DIR!" (
101-
mkdir "!RABBITMQ_GENERATED_CONFIG_DIR!"
102-
)
103-
104-
if not exist "!RABBITMQ_SCHEMA_DIR!\rabbit.schema" (
105-
copy "!RABBITMQ_HOME!\priv\schema\rabbit.schema" "!RABBITMQ_SCHEMA_DIR!\rabbit.schema"
106-
)
107-
108184
set RABBITMQ_EBIN_PATH="-pa !RABBITMQ_EBIN_ROOT!"
109185

110-
CALL :get_noex !RABBITMQ_CONFIG_FILE! RABBITMQ_CONFIG_FILE_NOEX
111-
112-
if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.config" (
113-
if exist "!RABBITMQ_CONFIG_FILE!" (
114-
set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE_NOEX!"
115-
)
116-
) else if "!RABBITMQ_CONFIG_FILE!" == "!RABBITMQ_CONFIG_FILE_NOEX!.conf" (
117-
set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE_NOEX!" ^
118-
-conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
119-
-conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
120-
-conf_schema_dir "!RABBITMQ_SCHEMA_DIR!"
121-
if exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" (
122-
set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^
123-
-conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
124-
-config "!RABBITMQ_ADVANCED_CONFIG_FILE!"
125-
)
126-
) else (
127-
if exist "!RABBITMQ_CONFIG_FILE!.config" (
128-
set RABBITMQ_CONFIG_ARG=-config "!RABBITMQ_CONFIG_FILE!"
129-
) else if exist "!RABBITMQ_CONFIG_FILE!.conf" (
130-
set RABBITMQ_CONFIG_ARG=-conf "!RABBITMQ_CONFIG_FILE!" ^
131-
-conf_dir "!RABBITMQ_GENERATED_CONFIG_DIR!" ^
132-
-conf_script_dir !CONF_SCRIPT_DIR:\=/! ^
133-
-conf_schema_dir "!RABBITMQ_SCHEMA_DIR!"
134-
if exist "!RABBITMQ_ADVANCED_CONFIG_FILE!.config" (
135-
set RABBITMQ_CONFIG_ARG=!RABBITMQ_CONFIG_ARG! ^
136-
-conf_advanced "!RABBITMQ_ADVANCED_CONFIG_FILE!" ^
137-
-config "!RABBITMQ_ADVANCED_CONFIG_FILE!"
138-
)
139-
)
140-
)
141-
142186
set RABBITMQ_LISTEN_ARG=
143187
if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
144188
if not "!RABBITMQ_NODE_PORT!"=="" (
145189
set RABBITMQ_LISTEN_ARG=-rabbit tcp_listeners [{\""!RABBITMQ_NODE_IP_ADDRESS!"\","!RABBITMQ_NODE_PORT!"}]
146190
)
147191
)
148192

149-
REM If $RABBITMQ_LOGS is '-', send all log messages to stdout. This is
193+
REM If !RABBITMQ_LOGS! is '-', send all log messages to stdout. This is
150194
REM particularly useful for Docker images.
151195

152196
if "!RABBITMQ_LOGS!" == "-" (
@@ -191,6 +235,7 @@ if "!ENV_OK!"=="false" (
191235
-boot start_sasl ^
192236
!RABBITMQ_START_RABBIT! ^
193237
!RABBITMQ_CONFIG_ARG! ^
238+
!RABBITMQ_GENERATED_CONFIG_ARG! ^
194239
!RABBITMQ_NAME_TYPE! !RABBITMQ_NODENAME! ^
195240
+W w ^
196241
+A "!RABBITMQ_IO_THREAD_POOL_SIZE!" ^

0 commit comments

Comments
 (0)