From 3037dfaf8f61ca034821f07f098e1ca64e810076 Mon Sep 17 00:00:00 2001
From: jangdongsin <jdsjjang@daum.net>
Date: Thu, 19 Sep 2024 18:10:39 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A6=AC=ED=8F=AC=ED=8A=B8=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../munjaon/server/server/task/ReportServerTask.java | 12 ++++++------
 src/main/resources/local/application-local.yml       |  9 +++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/munjaon/server/server/task/ReportServerTask.java b/src/main/java/com/munjaon/server/server/task/ReportServerTask.java
index 10bd2fe..9c76d79 100644
--- a/src/main/java/com/munjaon/server/server/task/ReportServerTask.java
+++ b/src/main/java/com/munjaon/server/server/task/ReportServerTask.java
@@ -123,6 +123,10 @@ public class ReportServerTask extends Thread {
                 recvInterest();
                 /* RUN Flag 체크 */
                 reloadRunFlag();
+                /* 쓰레드 완료 시점 체크 */
+                if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME > ServerConfig.REPORT_EXEC_CYCLE_TIME) {
+                    break;
+                }
             }
         } catch (Exception e) {
             /* 세션 만료 여부 */
@@ -298,7 +302,7 @@ public class ReportServerTask extends Thread {
                 }
             } else if (size == 0) {
                 Thread.sleep(1);
-                if (System.currentTimeMillis() - reportUserDto.getLastTrafficTime() > ServerConfig.REPORT_EXEC_CYCLE_TIME) {
+                if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME >= ServerConfig.REPORT_EXEC_CYCLE_TIME) {
                     this.isExpiredYn = true;
                     break;
                 }
@@ -338,7 +342,7 @@ public class ReportServerTask extends Thread {
     }
 
     private void sendInterest() throws Exception {
-        if (!reportUserDto.isLogin()) {
+        if (isPacketSendYn) {
             return;
         }
         if (reportUserDto.isAlive() == 2) {
@@ -363,10 +367,6 @@ public class ReportServerTask extends Thread {
                 isPacketSendYn = true;
             }
         }
-        /* 쓰레드 완료 시점 체크 */
-        if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME > ServerConfig.REPORT_EXEC_CYCLE_TIME) {
-            this.isExpiredYn = true;
-        }
     }
 
     private void expireConnectUser() {
diff --git a/src/main/resources/local/application-local.yml b/src/main/resources/local/application-local.yml
index 5b6f236..8f828e2 100644
--- a/src/main/resources/local/application-local.yml
+++ b/src/main/resources/local/application-local.yml
@@ -17,7 +17,12 @@ server:
   shutdown: graceful
 
 # ### 에이전트 설정 관련 ####################################################################################
+#agent:
+#  root-path: C:/apps/agent_server
+#  server-property-file: C:/apps/agent_server/config/server.properties
+#  db-name: mjon_agent_back
+
 agent:
-  root-path: C:/apps/agent_server
-  server-property-file: C:/apps/agent_server/config/server.properties
+  root-path: /Users/jangdongsin/DevDocs/apps/itn/agent_server
+  server-property-file: /Users/jangdongsin/DevDocs/apps/itn/agent_server/config/server.properties
   db-name: mjon_agent_back
\ No newline at end of file