From f3ed24d48c9d56f29b33ceda103a1b4438761a32 Mon Sep 17 00:00:00 2001
From: scnoh <stc9606@palnet.co.kr>
Date: Fri, 19 Aug 2022 09:35:52 +0900
Subject: [PATCH] =?UTF-8?q?rabbitmq=20config=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/message/config/MessageConfig.java     | 15 ++++++++++++++-
 .../process/message/consumer/MessageConsumer.java |  3 ++-
 src/main/resources/application.yml                |  4 ----
 .../com/palnet/PavWebsocketApplicationTests.java  | 13 -------------
 4 files changed, 16 insertions(+), 19 deletions(-)
 delete mode 100644 src/test/java/com/palnet/PavWebsocketApplicationTests.java

diff --git a/src/main/java/com/palnet/process/message/config/MessageConfig.java b/src/main/java/com/palnet/process/message/config/MessageConfig.java
index 299acf0..bcb6eca 100644
--- a/src/main/java/com/palnet/process/message/config/MessageConfig.java
+++ b/src/main/java/com/palnet/process/message/config/MessageConfig.java
@@ -16,9 +16,22 @@ import org.springframework.core.env.Environment;
 @Configuration
 @Slf4j
 public class MessageConfig {
+
+    private final Environment env;
+
+    public MessageConfig(Environment env) {
+        this.env = env;
+    }
     @Bean
     public CachingConnectionFactory cachingConnectionFactory() {
-        return new CachingConnectionFactory();
+        CachingConnectionFactory connectionFactory = new CachingConnectionFactory();
+
+        connectionFactory.setHost(env.getProperty("spring.rabbitmq.host"));
+        connectionFactory.setPort(Integer.parseInt(env.getProperty("spring.rabbitmq.port")));
+        connectionFactory.setUsername(env.getProperty("spring.rabbitmq.username"));
+        connectionFactory.setPassword(env.getProperty("spring.rabbitmq.password"));
+
+        return connectionFactory;
     }
 
     @Bean
diff --git a/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java b/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java
index 137bd46..48b4a76 100644
--- a/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java
+++ b/src/main/java/com/palnet/process/message/consumer/MessageConsumer.java
@@ -28,8 +28,9 @@ public class MessageConsumer {
 	}
 
     @RabbitHandler
-    @RabbitListener(queues = {"websocket.drone.queue"}, concurrency = "8")
+    @RabbitListener(queues = {"websocket.drone.queue"})
     public void receiveDroneMessage(final String message) throws JsonProcessingException {
+		log.info("websocket message : {}", message);
 
 		GPModel model = objectMapper.readValue(message, GPModel.class);
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6d87f86..e3e4955 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -42,10 +42,6 @@ spring:
     port: 5672
     username: palnet
     password: palnet1234
-    listener:
-      simple:
-        max-concurrency: 8
-        concurrency: 4
 
 server:
   port: 8181
diff --git a/src/test/java/com/palnet/PavWebsocketApplicationTests.java b/src/test/java/com/palnet/PavWebsocketApplicationTests.java
deleted file mode 100644
index 1878032..0000000
--- a/src/test/java/com/palnet/PavWebsocketApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.palnet;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class PavWebsocketApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}