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

클라이언트 IP체크, 큐 DB 적재 로직 수정

Browse Source
This commit is contained in:
jangdongsin 2025-01-08 23:58:09 +09:00
parent fda519db46
commit f803f5c5a1
4 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/munjaon/server/queue/pool/QueuePool.java
View File

@ -64,9 +64,9 @@ public abstract class QueuePool {
public void pushQueue(BasicMessageDto data) throws Exception { public void pushQueue(BasicMessageDto data) throws Exception {
synchronized(lockMonitor) { synchronized(lockMonitor) {
if (queuePool.isEmpty()) { if (queuePool.isEmpty()) {
try{ try {
lockMonitor.wait(); lockMonitor.wait();
}catch(InterruptedException e){ } catch (InterruptedException e) {
// 아무 처리도 하지 않는다. // 아무 처리도 하지 않는다.
} }
} }

7
src/main/java/com/munjaon/server/queue/pool/ReadQueue.java
View File

@ -195,13 +195,16 @@ public abstract class ReadQueue {
/* Pop Counter 증가 및 저장 */ /* Pop Counter 증가 및 저장 */
this.popCounter = this.popCounter + 1; this.popCounter = this.popCounter + 1;
writePopCounter(); writePopCounter();
} }
return messageDto; return messageDto;
} }
public void resetPopCounter(int resetCounter) throws IOException {
this.popCounter = this.popCounter - resetCounter;
writePopCounter();
}
abstract void popBuffer() throws Exception; abstract void popBuffer() throws Exception;
abstract void getBytesForExtendMessage(BasicMessageDto messageDto) throws UnsupportedEncodingException; abstract void getBytesForExtendMessage(BasicMessageDto messageDto) throws UnsupportedEncodingException;
abstract void initDataBuffer(); abstract void initDataBuffer();

14
src/main/java/com/munjaon/server/server/service/QueueServerService.java
View File

@ -213,8 +213,18 @@ public class QueueServerService extends Service {
// DB 처리한 카운트에 대한 처리 // DB 처리한 카운트에 대한 처리
if (DB_PROC_COUNT > 0) { if (DB_PROC_COUNT > 0) {
worker.saveMessageForList(list); boolean isError = false;
Thread.sleep(10); try {
worker.saveMessageForList(list);
Thread.sleep(10);
} catch (Exception e) {
saveLog(e);
isError = true;
}
/* DB 적재 실패시 처리 */
if (isError) {
readQueue.resetPopCounter(DB_PROC_COUNT);
}
} else { } else {
Thread.sleep(100); Thread.sleep(100);
} }

4
src/main/java/com/munjaon/server/server/task/CollectServerTask.java
View File

@ -756,10 +756,10 @@ public class CollectServerTask extends Thread {
saveLog(printTaskLog() + "[REMOTE IP : " + connectUserDto.getRemoteIP() + "]"); saveLog(printTaskLog() + "[REMOTE IP : " + connectUserDto.getRemoteIP() + "]");
saveLog(printTaskLog() + "[ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]"); saveLog(printTaskLog() + "[ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]");
saveLog(printTaskLog() + "[ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]"); saveLog(printTaskLog() + "[ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]");
if (memberDto.getAllowIpBasic() != null && connectUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) { if (memberDto.getAllowIpBasic() != null && connectUserDto.getRemoteIP().indexOf(memberDto.getAllowIpBasic()) >= 0) {
isPermit = true; isPermit = true;
} }
if (memberDto.getAllowIpExtend() != null && connectUserDto.getRemoteIP().equals(memberDto.getAllowIpExtend())) { if (memberDto.getAllowIpExtend() != null && connectUserDto.getRemoteIP().indexOf(memberDto.getAllowIpExtend()) >= 0) {
isPermit = true; isPermit = true;
} }
} else { } else {