Skip to content

Commit f94d472

Browse files
Use RABBITMQ_ENABLED_PLUGINS instead of RABBITMQ_ENABLED_PLUGINS_FILE
gmake was ignoring the former env var.
1 parent d2b5f51 commit f94d472

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

selenium/bin/components/rabbitmq

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,22 @@ start_local_rabbitmq() {
6969
RABBITMQ_TEST_DIR="${RABBITMQ_CONFIG_DIR}" ${BIN_DIR}/gen-rabbitmq-conf ${RABBITMQ_CONFIG_DIR} $ENV_FILE /tmp$MOUNT_RABBITMQ_CONF
7070

7171
print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_RABBITMQ_CONF"
72-
${BIN_DIR}/gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE /tmp$MOUNT_ADVANCED_CONFIG
7372
cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins /tmp/etc/rabbitmq/
73+
RABBITMQ_ENABLED_PLUGINS=`cat /tmp/etc/rabbitmq/enabled_plugins | awk -F'[][]' '{print $2}'`
74+
print "> EFFECTIVE PLUGINS: $RABBITMQ_ENABLED_PLUGINS"
75+
76+
${BIN_DIR}/gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE /tmp$MOUNT_ADVANCED_CONFIG
7477
RESULT=$?
75-
cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins /tmp/etc/rabbitmq/
7678
if [ $RESULT -eq 0 ]; then
77-
print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_ADVANCED_CONFIG"
78-
gmake --directory=${RABBITMQ_SERVER_ROOT} run-broker \
79-
RABBITMQ_ENABLED_PLUGINS_FILE=/tmp/etc/rabbitmq/enabled_plugins \
79+
print "> EFFECTIVE RABBITMQ_CONFIG_FILE: /tmp$MOUNT_ADVANCED_CONFIG"
80+
gmake --directory=${RABBITMQ_SERVER_ROOT} \
81+
RABBITMQ_ENABLED_PLUGINS="$RABBITMQ_ENABLED_PLUGINS" \
8082
RABBITMQ_CONFIG_FILE=/tmp$MOUNT_RABBITMQ_CONF \
81-
RABBITMQ_ADVANCED_CONFIG_FILE=/tmp$MOUNT_ADVANCED_CONFIG
83+
RABBITMQ_ADVANCED_CONFIG_FILE=/tmp$MOUNT_ADVANCED_CONFIG run-broker
8284
else
83-
gmake --directory=${RABBITMQ_SERVER_ROOT} run-broker \
84-
RABBITMQ_ENABLED_PLUGINS_FILE=/tmp/etc/rabbitmq/enabled_plugins \
85-
RABBITMQ_CONFIG_FILE=/tmp$MOUNT_RABBITMQ_CONF
85+
gmake --directory=${RABBITMQ_SERVER_ROOT} \
86+
RABBITMQ_ENABLED_PLUGINS="$RABBITMQ_ENABLED_PLUGINS" \
87+
RABBITMQ_CONFIG_FILE=/tmp$MOUNT_RABBITMQ_CONF run-broker
8688
fi
8789
print "> RABBITMQ_TEST_DIR: ${RABBITMQ_CONFIG_DIR}"
8890

0 commit comments

Comments
 (0)