Merge pull request #244 from team9502/dev

배포
team9502 · Jun 29, 2024 · 1be6344 · 1be6344
2 parents a8e248e + 38bc821
commit 1be6344
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/sinChul.yml b/.github/workflows/sinChul.yml
@@ -36,7 +36,19 @@ jobs:
           target: "/home/ec2-user"
           strip_components: 2
 
-
+      - name: Stop existing Green Server
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ec2-user
+          key: ${{ secrets.SSH_KEY }}
+          port: 22
+          script_stop: true
+          script: |
+            PID=$(lsof -t -i:8081)
+            if [ -n "$PID" ]; then
+              sudo kill -9 $PID
+            fi
       - name: Deploy to Green Server
         uses: appleboy/[email protected]
         with:

diff --git a/src/main/java/team9502/sinchulgwinong/domain/chat/service/RedisSubscriber.java b/src/main/java/team9502/sinchulgwinong/domain/chat/service/RedisSubscriber.java
@@ -20,6 +20,7 @@ public class RedisSubscriber implements MessageListener {
     public void onMessage(Message message, byte[] pattern) {
         try {
             ChatMessage chatMessage = objectMapper.readValue(message.getBody(), ChatMessage.class);
+
             messagingTemplate.convertAndSend("/topic/chatroom/" +
                     chatMessage.getChatRoom().getChatRoomId(), chatMessage);
 

diff --git a/src/main/java/team9502/sinchulgwinong/global/config/RedisConfig.java b/src/main/java/team9502/sinchulgwinong/global/config/RedisConfig.java
@@ -58,6 +58,6 @@ public ChannelTopic topic() {
     @Bean
     public MessageListenerAdapter messageListener(RedisSubscriber subscriber) {
 
-        return new MessageListenerAdapter(subscriber);
+        return new MessageListenerAdapter(subscriber, "onMessage");
     }
 }
diff --git a/src/main/java/team9502/sinchulgwinong/global/config/WebSecurityConfig.java b/src/main/java/team9502/sinchulgwinong/global/config/WebSecurityConfig.java
@@ -50,7 +50,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                                 "/cpUsers/{cpUserId}/profile",
                                 "/business/status",
                                 "/business/verify",
-                                "/faqs/**"
+                                "/faqs/**",
+                                "/ws"
                         ).permitAll()
                         .requestMatchers(HttpMethod.GET,
                                 "/cpUsers",