Merge branch 'release/v2.4.2'

.gitignore

@@ -31,3 +31,5 @@ build/
 
 ### VS Code ###
 .vscode/
+
+newrelic.yml

Dockerfile

@@ -1,17 +1,23 @@
 FROM openjdk:11
 
-ARG XMX=1024m
+ARG XMX=4096m
 ARG PROFILE=production
 ARG CLOUD_CONFIG
+ARG ILI_QUEUE
+ARG NEW_RELIC_ENVIRONMENT
 
 ENV XMX=$XMX
 ENV PROFILE=$PROFILE
 ENV CLOUD_CONFIG=$CLOUD_CONFIG
+ENV ILI_QUEUE=$ILI_QUEUE
+ENV NEW_RELIC_ENVIRONMENT=$NEW_RELIC_ENVIRONMENT
 
 VOLUME /tmp
 
-ADD  ./target/st-microservice-ili-2.2.0.jar st-microservice-ili.jar
+ADD ./target/st-microservice-ili-2.4.2.jar st-microservice-ili.jar
+ADD ./target/newrelic.jar newrelic.jar
+ADD ./newrelic.yml newrelic.yml
 
 EXPOSE 8080
 
-ENTRYPOINT java -Xmx$XMX -jar /st-microservice-ili.jar --spring.profiles.active=$PROFILE --spring.cloud.config.uri=$CLOUD_CONFIG
+ENTRYPOINT java -javaagent:/newrelic.jar -Dnewrelic.environment=$NEW_RELIC_ENVIRONMENT -Xmx$XMX -jar /st-microservice-ili.jar --spring.profiles.active=$PROFILE --spring.cloud.config.uri=$CLOUD_CONFIG --st.rabbitmq.queueInstance=$ILI_QUEUE

pom.xml

@@ -14,7 +14,7 @@
 
 	<groupId>com.ai.st.microservice.ili</groupId>
 	<artifactId>st-microservice-ili</artifactId>
-	<version>2.4.0</version>
+	<version>2.4.2</version>
 	<name>st-microservice-ili</name>
 	<description>Microservice ILI</description>
 

src/main/java/com/ai/st/microservice/ili/services/rabbitmq/RabbitMQConfig.java

@@ -250,10 +250,58 @@ public DirectExchange exchangeResultProcessSinicFilesName() {
         return new DirectExchange(queueResultProcessSinicFilesExchange);
     }
 
+    // queue ili sinic large
+
+    @Value("${st.rabbitmq.queueIliSinicLarge.queue}")
+    public String queueIliSinicLargeName;
+
+    @Value("${st.rabbitmq.queueIliSinicLarge.exchange}")
+    public String exchangeIliSinicLargeName;
+
+    @Value("${st.rabbitmq.queueIliSinicLarge.routingkey}")
+    public String routingkeyIliSinicLargeName;
+
+    @Bean
+    public Queue queueIliSinicLargeName() {
+        return new Queue(queueIliSinicLargeName, false);
+    }
+
+    @Bean
+    public DirectExchange exchangeIliSinicLargeName() {
+        return new DirectExchange(exchangeIliSinicLargeName);
+    }
+
+    @Bean
+    public Binding bindingIliSinicLargeName() {
+        return BindingBuilder.bind(queueIliSinicLargeName()).to(exchangeIliSinicLargeName())
+                .with(routingkeyIliSinicLargeName);
+    }
+
+    // queue ili sinic small
+
+    @Value("${st.rabbitmq.queueIliSinicSmall.queue}")
+    public String queueIliSinicSmallName;
+
+    @Value("${st.rabbitmq.queueIliSinicSmall.exchange}")
+    public String exchangeIliSinicSmallName;
+
+    @Value("${st.rabbitmq.queueIliSinicSmall.routingkey}")
+    public String routingkeyIliSinicSmallName;
+
+    @Bean
+    public Queue queueIliSinicSmallName() {
+        return new Queue(queueIliSinicSmallName, false);
+    }
+
+    @Bean
+    public DirectExchange exchangeIliSinicSmallName() {
+        return new DirectExchange(exchangeIliSinicSmallName);
+    }
+
     @Bean
-    public Binding bindingResultProcessSinicFilesName() {
-        return BindingBuilder.bind(queueResultProcessSinicFilesName()).to(exchangeResultProcessSinicFilesName())
-                .with(queueResultProcessSinicFilesRoutingKey);
+    public Binding bindingIliSinicSmallName() {
+        return BindingBuilder.bind(queueIliSinicSmallName()).to(exchangeIliSinicSmallName())
+                .with(routingkeyIliSinicSmallName);
     }
 
     // Setup

src/main/java/com/ai/st/microservice/ili/services/rabbitmq/listerners/RabbitMQIliListener.java

@@ -70,7 +70,7 @@ public class RabbitMQIliListener {
     @Autowired
     private VersionBusiness versionBusiness;
 
-    @RabbitListener(queues = "${st.rabbitmq.queueIli.queue}", concurrency = "${st.rabbitmq.queueIli.concurrency}")
+    @RabbitListener(queues = "${st.rabbitmq.queueInstance}", concurrency = "1")
     public void iliProcess(IliProcessQueueDto data) {
 
         log.info("ili process started");

src/main/resources/application.yml

@@ -27,4 +27,7 @@ server:
 
 iliProcesses:
   srs: "9377"
-
+
+st:
+  rabbitmq:
+    queueInstance: st.queue.ili