Commit @3037dfaf8f61ca034821f07f098e1ca64e810076

장동신 2024-09-19

리포트 로직 수정

@3037dfaf8f61ca034821f07f098e1ca64e810076

4bc5fbc

3037dfa

src/main/java/com/munjaon/server/server/task/ReportServerTask.java

--- src/main/java/com/munjaon/server/server/task/ReportServerTask.java

+++ src/main/java/com/munjaon/server/server/task/ReportServerTask.java


                 recvInterest();
                 /* RUN Flag 체크 */
                 reloadRunFlag();
+                /* 쓰레드 완료 시점 체크 */
+                if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME > ServerConfig.REPORT_EXEC_CYCLE_TIME) {
+                    break;
+                }
             }
         } catch (Exception e) {
             /* 세션 만료 여부 */

                 }
             } 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;
                 }

     }
 
     private void sendInterest() throws Exception {
-        if (!reportUserDto.isLogin()) {
+        if (isPacketSendYn) {
             return;
         }
         if (reportUserDto.isAlive() == 2) {

                 SEND_CYCLE_CHECK_TIME = System.currentTimeMillis();
                 isPacketSendYn = true;
             }
-        }
-        /* 쓰레드 완료 시점 체크 */
-        if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME > ServerConfig.REPORT_EXEC_CYCLE_TIME) {
-            this.isExpiredYn = true;
         }
     }
 

4bc5fbc

3037dfa

src/main/resources/local/application-local.yml

--- src/main/resources/local/application-local.yml

+++ src/main/resources/local/application-local.yml


   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

Add a comment

Open 0
Closed 0

List

...	...	@@ -123,6 +123,10 @@
123	123	recvInterest();
124	124	/* RUN Flag 체크 */
125	125	reloadRunFlag();
	126	+ /* 쓰레드 완료 시점 체크 */
	127	+ if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME > ServerConfig.REPORT_EXEC_CYCLE_TIME) {
	128	+ break;
	129	+ }
126	130	}
127	131	} catch (Exception e) {
128	132	/* 세션 만료 여부 */
...	...	@@ -298,7 +302,7 @@
298	302	}
299	303	} else if (size == 0) {
300	304	Thread.sleep(1);
301		- if (System.currentTimeMillis() - reportUserDto.getLastTrafficTime() > ServerConfig.REPORT_EXEC_CYCLE_TIME) {
	305	+ if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME >= ServerConfig.REPORT_EXEC_CYCLE_TIME) {
302	306	this.isExpiredYn = true;
303	307	break;
304	308	}
...	...	@@ -338,7 +342,7 @@
338	342	}
339	343
340	344	private void sendInterest() throws Exception {
341		- if (!reportUserDto.isLogin()) {
	345	+ if (isPacketSendYn) {
342	346	return;
343	347	}
344	348	if (reportUserDto.isAlive() == 2) {
...	...	@@ -362,10 +366,6 @@
362	366	SEND_CYCLE_CHECK_TIME = System.currentTimeMillis();
363	367	isPacketSendYn = true;
364	368	}
365		- }
366		- /* 쓰레드 완료 시점 체크 */
367		- if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME > ServerConfig.REPORT_EXEC_CYCLE_TIME) {
368		- this.isExpiredYn = true;
369	369	}
370	370	}
371	371

...	...	@@ -17,7 +17,12 @@
17	17	shutdown: graceful
18	18
19	19	# ### 에이전트 설정 관련 ####################################################################################
	20	+#agent:
	21	+# root-path: C:/apps/agent_server
	22	+# server-property-file: C:/apps/agent_server/config/server.properties
	23	+# db-name: mjon_agent_back
	24	+
20	25	agent:
21		- root-path: C:/apps/agent_server
22		- server-property-file: C:/apps/agent_server/config/server.properties
	26	+ root-path: /Users/jangdongsin/DevDocs/apps/itn/agent_server
	27	+ server-property-file: /Users/jangdongsin/DevDocs/apps/itn/agent_server/config/server.properties
23	28	db-name: mjon_agent_back (No newline at end of file)

Delete comment