Index: src/main/groovy/com/lemanscorp/mqconsumer/listeners/RabbitMQListener.groovy =================================================================== diff -u -rbbf2e5405d63748b1584efc46c75fc36f48d22d7 -r6b244522a5e375740be0b5b832854a7e5a95f9cc --- src/main/groovy/com/lemanscorp/mqconsumer/listeners/RabbitMQListener.groovy (.../RabbitMQListener.groovy) (revision bbf2e5405d63748b1584efc46c75fc36f48d22d7) +++ src/main/groovy/com/lemanscorp/mqconsumer/listeners/RabbitMQListener.groovy (.../RabbitMQListener.groovy) (revision 6b244522a5e375740be0b5b832854a7e5a95f9cc) @@ -1,46 +1,47 @@ -package com.lemanscorp.mqconsumer.listeners - -import com.lemanscorp.mqconsumer.domains.QueueRequestType -import com.lemanscorp.mqconsumer.routers.UsToEuQueueMessageRouter -import groovy.util.logging.Slf4j -import org.springframework.amqp.rabbit.annotation.Argument -import org.springframework.amqp.rabbit.annotation.Exchange -import org.springframework.amqp.rabbit.annotation.Queue -import org.springframework.amqp.rabbit.annotation.QueueBinding -import org.springframework.amqp.rabbit.annotation.RabbitListener -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.stereotype.Component - -@Slf4j -@Component -class RabbitMQListener { - - @Autowired - UsToEuQueueMessageRouter usToEuQueueMessageRouter - - @RabbitListener( - bindings = @QueueBinding( - value = @Queue( - name = '${queue.usToEuSync}', - durable = 'true', - arguments = [ - @Argument(name = 'x-message-ttl', value = '${lemans.rabbitmq.usToEuMoveMessageToDeadLetterAfter}', type = 'java.lang.Integer'), - @Argument(name = 'x-dead-letter-exchange', value = '${lemans.rabbitmq.usToEuDeadLetterExchange}'), - @Argument(name = 'x-dead-letter-routing-key', value = '${lemans.rabbitmq.usToEuDeadLetterRoutingKey}') - ] - ), - exchange = @Exchange(name = '${lemans.rabbitmq.exchange}'), - key = '${lemans.rabbitmq.routingkey}' - ), - errorHandler = 'usToEuErrorHandler' - ) - void consumeRabbitQueue(Map payload) { - log.error "Processing Started for Payload: $payload" - usToEuQueueMessageRouter.usToEuMessageRouter( - payload.requestType as QueueRequestType, - payload.id as Integer, - payload.body - ) - log.error "Processing Finished for Payload: $payload" - } -} +package com.lemanscorp.mqconsumer.listeners + +import com.lemanscorp.mqconsumer.domains.QueueRequestType +import com.lemanscorp.mqconsumer.routers.UsToEuQueueMessageRouter +import groovy.util.logging.Slf4j +import org.springframework.amqp.rabbit.annotation.Argument +import org.springframework.amqp.rabbit.annotation.Exchange +import org.springframework.amqp.rabbit.annotation.Queue +import org.springframework.amqp.rabbit.annotation.QueueBinding +import org.springframework.amqp.rabbit.annotation.RabbitListener +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Component + +@Slf4j +@Component +class RabbitMQListener { + + @Autowired + UsToEuQueueMessageRouter usToEuQueueMessageRouter + + @RabbitListener( + bindings = @QueueBinding( + value = @Queue( + name = '${queue.usToEuSync}', + durable = 'true', + arguments = [ + @Argument(name = 'x-message-ttl', value = '${lemans.rabbitmq.usToEuMoveMessageToDeadLetterAfter}', type = 'java.lang.Integer'), + @Argument(name = 'x-dead-letter-exchange', value = '${lemans.rabbitmq.usToEuDeadLetterExchange}'), + @Argument(name = 'x-dead-letter-routing-key', value = '${lemans.rabbitmq.usToEuDeadLetterRoutingKey}'), + @Argument(name = 'x-single-active-consumer', value = '${lemans.rabbitmq.usToEuSingleActiveConsumer}') + ] + ), + exchange = @Exchange(name = '${lemans.rabbitmq.exchange}'), + key = '${lemans.rabbitmq.routingkey}' + ), + errorHandler = 'usToEuErrorHandler' + ) + void consumeRabbitQueue(Map payload) { + log.error "Processing Started for Payload: $payload" + usToEuQueueMessageRouter.usToEuMessageRouter( + payload.requestType as QueueRequestType, + payload.id as Integer, + payload.body + ) + log.error "Processing Finished for Payload: $payload" + } +} Index: src/main/resources/application.properties =================================================================== diff -u -rbbf2e5405d63748b1584efc46c75fc36f48d22d7 -r6b244522a5e375740be0b5b832854a7e5a95f9cc --- src/main/resources/application.properties (.../application.properties) (revision bbf2e5405d63748b1584efc46c75fc36f48d22d7) +++ src/main/resources/application.properties (.../application.properties) (revision 6b244522a5e375740be0b5b832854a7e5a95f9cc) @@ -1,36 +1,37 @@ -spring.application.name=mq-service - -spring.rabbitmq.host=dev-rabbitmq01vm.lemanscorp.com -spring.rabbitmq.port=5672 -spring.rabbitmq.username=lemans -spring.rabbitmq.password=o7GgEz2pA9mA -spring.rabbitmq.virtual-host=/ - -spring.rabbitmq.listener.type=direct -spring.rabbitmq.listener.direct.retry.enabled=true -spring.rabbitmq.listener.direct.retry.max-attempts=3 -spring.rabbitmq.listener.direct.retry.initial-interval=10000 -spring.rabbitmq.listener.direct.retry.max-interval=100000 -spring.rabbitmq.listener.direct.retry.multiplier=2.0 -spring.rabbitmq.listener.direct.default-requeue-rejected=true -spring.rabbitmq.listener.direct.prefetch=1 -spring.rabbitmq.listener.direct.acknowledge-mode=auto - -lemans.rabbitmq.exchange=lemans-us-eu-exchange -queue.usToEuSync=lemans-us-eu-queue -lemans.rabbitmq.routingkey=lemans-us-eu-routing-key - -lemans.rabbitmq.usToEuMoveMessageToDeadLetterAfter=18000000 -lemans.rabbitmq.usToEuDeadLetterExchange=lemans-us-eu-dead-letter-exchange -lemans.rabbitmq.usToEuDeadLetterQueue=lemans-us-eu-dead-letter-queue -lemans.rabbitmq.usToEuDeadLetterRoutingKey=lemans-us-eu-dead-letter-routing-key - -spring.datasource.url=jdbc:sqlserver://dev-dbprod02vm;databaseName=PartsSource_DS -spring.datasource.username=partssource_ds_user -spring.datasource.password=DevPassword1 - -datasource.eudsdb.url=jdbc:sqlserver://dev-dbprod02vm;databaseName=PartsSource_DS_Sync -datasource.eudsdb.username=partssource_ds_datasync_user -datasource.eudsdb.password=DevPassword1 - -server.port=8083 +spring.application.name=mq-service + +spring.rabbitmq.host=dev-rabbitmq01vm.lemanscorp.com +spring.rabbitmq.port=5672 +spring.rabbitmq.username=lemans +spring.rabbitmq.password=o7GgEz2pA9mA +spring.rabbitmq.virtual-host=/ + +spring.rabbitmq.listener.type=direct +spring.rabbitmq.listener.direct.retry.enabled=true +spring.rabbitmq.listener.direct.retry.max-attempts=3 +spring.rabbitmq.listener.direct.retry.initial-interval=10000 +spring.rabbitmq.listener.direct.retry.max-interval=100000 +spring.rabbitmq.listener.direct.retry.multiplier=2.0 +spring.rabbitmq.listener.direct.default-requeue-rejected=true +spring.rabbitmq.listener.direct.prefetch=1 +spring.rabbitmq.listener.direct.acknowledge-mode=auto + +lemans.rabbitmq.exchange=lemans-us-eu-exchange +queue.usToEuSync=lemans-us-eu-queue +lemans.rabbitmq.routingkey=lemans-us-eu-routing-key + +lemans.rabbitmq.usToEuMoveMessageToDeadLetterAfter=18000000 +lemans.rabbitmq.usToEuDeadLetterExchange=lemans-us-eu-dead-letter-exchange +lemans.rabbitmq.usToEuDeadLetterQueue=lemans-us-eu-dead-letter-queue +lemans.rabbitmq.usToEuDeadLetterRoutingKey=lemans-us-eu-dead-letter-routing-key +lemans.rabbitmq.usToEuSingleActiveConsumer=true + +spring.datasource.url=jdbc:sqlserver://dev-dbprod02vm;databaseName=PartsSource_DS +spring.datasource.username=partssource_ds_user +spring.datasource.password=DevPassword1 + +datasource.eudsdb.url=jdbc:sqlserver://dev-dbprod02vm;databaseName=PartsSource_DS_Sync +datasource.eudsdb.username=partssource_ds_datasync_user +datasource.eudsdb.password=DevPassword1 + +server.port=8083