Rename AMQP_SERVER_ENGINE->AMQP_SERVER_TYPE

This commit is contained in:
Alexey Golubev 2019-03-05 18:12:54 +03:00
parent 88f33c5d8f
commit 1fe33f849f
3 changed files with 5 additions and 5 deletions

View file

@ -64,7 +64,7 @@ read_setting(){
RABBITMQ_SERVER_URL=${RABBITMQ_SERVER_URL:-$(${JSON} rabbitmq.url)}
AMQP_SERVER_URL=${AMQP_SERVER_URL:-${RABBITMQ_SERVER_URL}}
AMQP_SERVER_ENGINE=${AMQP_SERVER_ENGINE:-rabbitmq}
AMQP_SERVER_TYPE=${AMQP_SERVER_TYPE:-rabbitmq}
parse_rabbitmq_url ${AMQP_SERVER_URL}
REDIS_SERVER_HOST=${REDIS_SERVER_HOST:-$(${JSON} services.CoAuthoring.redis.host)}
@ -144,12 +144,12 @@ update_postgresql_settings(){
}
update_rabbitmq_setting(){
if [ "${AMQP_SERVER_ENGINE}" == "rabbitmq" ]; then
if [ "${AMQP_SERVER_TYPE}" == "rabbitmq" ]; then
${JSON} -I -e "this.rabbitmq.url = '${RABBITMQ_SERVER_URL}'"
sed 's/\(exports\.USE_RABBIT_MQ = \).*\(;\)/'"\1true\2"'/' -i ${APP_DIR}/server/Common/sources/constants.js
fi
if [ "${AMQP_SERVER_ENGINE}" == "activemq" ]; then
if [ "${AMQP_SERVER_TYPE}" == "activemq" ]; then
${JSON} -I -e "if(this.activemq===undefined)this.activemq={};"
${JSON} -I -e "if(this.activemq.connectOptions===undefined)this.activemq.connectOptions={};"