tolag3/mjon_agent_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

리포트 로직 수정

Browse Source
This commit is contained in:
jangdongsin 2024-09-19 18:10:39 +09:00
parent 4bc5fbcc26
commit 3037dfaf8f
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/munjaon/server/server/task/ReportServerTask.java
View File

@ -123,6 +123,10 @@ public class ReportServerTask extends Thread {
recvInterest(); recvInterest();
/* RUN Flag 체크 */ /* RUN Flag 체크 */
reloadRunFlag(); reloadRunFlag();
/* 쓰레드 완료 시점 체크 */
if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME > ServerConfig.REPORT_EXEC_CYCLE_TIME) {
break;
}
} }
} catch (Exception e) { } catch (Exception e) {
/* 세션 만료 여부 */ /* 세션 만료 여부 */
@ -298,7 +302,7 @@ public class ReportServerTask extends Thread {
} }
} else if (size == 0) { } else if (size == 0) {
Thread.sleep(1); 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; this.isExpiredYn = true;
break; break;
} }
@ -338,7 +342,7 @@ public class ReportServerTask extends Thread {
} }
private void sendInterest() throws Exception { private void sendInterest() throws Exception {
if (!reportUserDto.isLogin()) { if (isPacketSendYn) {
return; return;
} }
if (reportUserDto.isAlive() == 2) { if (reportUserDto.isAlive() == 2) {
@ -363,10 +367,6 @@ public class ReportServerTask extends Thread {
isPacketSendYn = true; isPacketSendYn = true;
} }
} }
/* 쓰레드 완료 시점 체크 */
if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME > ServerConfig.REPORT_EXEC_CYCLE_TIME) {
this.isExpiredYn = true;
}
} }
private void expireConnectUser() { private void expireConnectUser() {

9
src/main/resources/local/application-local.yml
View File

@ -17,7 +17,12 @@ server:
shutdown: graceful 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: agent:
root-path: C:/apps/agent_server root-path: /Users/jangdongsin/DevDocs/apps/itn/agent_server
server-property-file: C:/apps/agent_server/config/server.properties server-property-file: /Users/jangdongsin/DevDocs/apps/itn/agent_server/config/server.properties
db-name: mjon_agent_back db-name: mjon_agent_back