diff options
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 95bf009265..8eca8b6967 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -58,21 +58,6 @@ esac RABBITMQ_EBIN_ROOT="${RABBITMQ_HOME}/ebin" -# generate_config() { -# rm -rf ${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq.config -# ./cuttlefish -e ${RABBITMQ_GENERATED_CONFIG_DIR} -s ./schema -c ${RABBITMQ_CONFIG_FILE}.conf -f rabbitmq -# mv ${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq.*.config ${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq.config -# } - -# if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then -# RABBITMQ_CONFIG_FILE_ACTUAL=$RABBITMQ_CONFIG_FILE -# else -# [ -f "${RABBITMQ_CONFIG_FILE}.conf" ] && -# [ -d $RABBITMQ_GENERATED_CONFIG_DIR ] && -# generate_config && -# RABBITMQ_CONFIG_FILE_ACTUAL="${RABBITMQ_GENERATED_CONFIG_DIR}/generated/rabbitmq" -# fi - set +e RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \ @@ -83,8 +68,11 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ -hidden \ -s rabbit_prelaunch \ ${RABBITMQ_NAME_TYPE} rabbitmqprelaunch$$ \ + -conf_dir "${RABBITMQ_GENERATED_CONFIG_DIR}" \ + -conf_gen_script "`dirname $0`/cuttlefish" \ -extra "${RABBITMQ_NODENAME}" - + +exit 89 PRELAUNCH_RESULT=$? if [ ${PRELAUNCH_RESULT} = 2 ] ; then # dist port is mentioned in config, so do not set it @@ -101,7 +89,7 @@ set -e if [ -f "${RABBITMQ_CONFIG_FILE}.config" ]; then RABBITMQ_CONFIG_ARG="-config ${RABBITMQ_CONFIG_FILE}" elif [ -f "${RABBITMQ_CONFIG_FILE}.conf" ]; then - RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} -conf_gen_script `dirname $0`/generate-config" + RABBITMQ_CONFIG_ARG="-conf ${RABBITMQ_CONFIG_FILE} -conf_dir ${RABBITMQ_GENERATED_CONFIG_DIR} -conf_gen_script `dirname $0`/cuttlefish" fi RABBITMQ_LISTEN_ARG= @@ -124,7 +112,7 @@ fi set -f start_rabbitmq_server() { - RABBITMQ_CONFIG_FILE_ACTUAL=$RABBITMQ_CONFIG_FILE_ACTUAL \ + RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \ exec ${ERL_DIR}erl \ -pa ${RABBITMQ_EBIN_ROOT} \ ${RABBITMQ_START_RABBIT} \ |