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