From 011366d31bcda7a3949b875047ff9c96fcf26e87 Mon Sep 17 00:00:00 2001 From: jangdongsin Date: Mon, 14 Oct 2024 16:02:58 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A0=84=EC=86=A1=ED=81=90=20pushQueue=20?= =?UTF-8?q?=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=8B=9C=EA=B7=B8=EB=8B=88?= =?UTF-8?q?=EC=B2=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/queue/enums/QueueTypeWorker.java | 12 ++--- .../queue/service/KakaoAlarmQueueService.java | 6 ++- .../service/KakaoFriendQueueService.java | 6 ++- .../server/queue/service/LmsQueueService.java | 6 ++- .../server/queue/service/MmsQueueService.java | 6 ++- .../server/queue/service/QueueAction.java | 2 +- .../server/queue/service/SmsQueueService.java | 6 ++- .../service/CollectBackServerService.java | 2 +- .../server/server/service/CollectServer.java | 10 ++-- .../server/service/HealthCheckServer.java | 6 +-- .../server/service/QueueServerService.java | 9 ++++ .../server/server/service/ReportServer.java | 12 ++--- .../server/server/task/CollectReadTask.java | 28 +++++------ .../server/server/task/CollectServerTask.java | 38 +++++++-------- .../server/server/task/ReportBindTask.java | 12 ++--- .../server/task/ReportLinkCheckTask.java | 8 ++-- .../server/server/task/ReportQueueTask.java | 2 +- .../server/server/task/ReportReadTask.java | 20 ++++---- .../server/server/task/ReportResultTask.java | 12 ++--- .../server/server/task/ReportServerTask.java | 48 +++++++++---------- .../server/server/task/SendReadTask.java | 30 ++++++------ .../server/server/task/StatusCheckTask.java | 14 +++--- 22 files changed, 162 insertions(+), 133 deletions(-) diff --git a/src/main/java/com/munjaon/server/queue/enums/QueueTypeWorker.java b/src/main/java/com/munjaon/server/queue/enums/QueueTypeWorker.java index b28ab76..d0715ee 100644 --- a/src/main/java/com/munjaon/server/queue/enums/QueueTypeWorker.java +++ b/src/main/java/com/munjaon/server/queue/enums/QueueTypeWorker.java @@ -36,7 +36,7 @@ public enum QueueTypeWorker { } @Override - public void pushQueue(BasicMessageDto data) { + public void pushQueue(BasicMessageDto data) throws Exception { SmsQueueService smsQueueService = (SmsQueueService) QueueService.SMS_QUEUE_SERVICE.getService(); smsQueueService.pushQueue(data); } @@ -103,7 +103,7 @@ public enum QueueTypeWorker { } @Override - public void pushQueue(BasicMessageDto data) { + public void pushQueue(BasicMessageDto data) throws Exception { LmsQueueService lmsQueueService = (LmsQueueService) QueueService.LMS_QUEUE_SERVICE.getService(); lmsQueueService.pushQueue(data); } @@ -170,7 +170,7 @@ public enum QueueTypeWorker { } @Override - public void pushQueue(BasicMessageDto data) { + public void pushQueue(BasicMessageDto data) throws Exception { MmsQueueService mmsQueueService = (MmsQueueService) QueueService.MMS_QUEUE_SERVICE.getService(); mmsQueueService.pushQueue(data); } @@ -237,7 +237,7 @@ public enum QueueTypeWorker { } @Override - public void pushQueue(BasicMessageDto data) { + public void pushQueue(BasicMessageDto data) throws Exception { KakaoAlarmQueueService kakaoAlarmQueueService = (KakaoAlarmQueueService) QueueService.KAT_QUEUE_SERVICE.getService(); kakaoAlarmQueueService.pushQueue(data); } @@ -304,7 +304,7 @@ public enum QueueTypeWorker { } @Override - public void pushQueue(BasicMessageDto data) { + public void pushQueue(BasicMessageDto data) throws Exception { KakaoFriendQueueService kakaoFriendQueueService = (KakaoFriendQueueService) QueueService.KFT_QUEUE_SERVICE.getService(); kakaoFriendQueueService.pushQueue(data); } @@ -366,7 +366,7 @@ public enum QueueTypeWorker { public abstract boolean isExistQueue(String name); public abstract void removeQueue(String name); public abstract void addQueue(WriteQueue queue); - public abstract void pushQueue(BasicMessageDto data); + public abstract void pushQueue(BasicMessageDto data) throws Exception; public abstract int saveMessageToTable(BasicMessageDto data); public abstract int saveMessageForList(List list); diff --git a/src/main/java/com/munjaon/server/queue/service/KakaoAlarmQueueService.java b/src/main/java/com/munjaon/server/queue/service/KakaoAlarmQueueService.java index b6aebaf..224d827 100644 --- a/src/main/java/com/munjaon/server/queue/service/KakaoAlarmQueueService.java +++ b/src/main/java/com/munjaon/server/queue/service/KakaoAlarmQueueService.java @@ -43,7 +43,11 @@ public class KakaoAlarmQueueService implements QueueAction { } @Override - public void pushQueue(BasicMessageDto data) { + public void pushQueue(BasicMessageDto data) throws Exception { + queueInstance.pushQueue(data); + } + + public void pushQueue_bak(BasicMessageDto data) { boolean isError = false; try { queueInstance.pushQueue(data); diff --git a/src/main/java/com/munjaon/server/queue/service/KakaoFriendQueueService.java b/src/main/java/com/munjaon/server/queue/service/KakaoFriendQueueService.java index 7c033bd..2939d85 100644 --- a/src/main/java/com/munjaon/server/queue/service/KakaoFriendQueueService.java +++ b/src/main/java/com/munjaon/server/queue/service/KakaoFriendQueueService.java @@ -43,7 +43,11 @@ public class KakaoFriendQueueService implements QueueAction { } @Override - public void pushQueue(BasicMessageDto data) { + public void pushQueue(BasicMessageDto data) throws Exception { + queueInstance.pushQueue(data); + } + + public void pushQueue_bak(BasicMessageDto data) { boolean isError = false; try { queueInstance.pushQueue(data); diff --git a/src/main/java/com/munjaon/server/queue/service/LmsQueueService.java b/src/main/java/com/munjaon/server/queue/service/LmsQueueService.java index fb2d81c..a5b0dfd 100644 --- a/src/main/java/com/munjaon/server/queue/service/LmsQueueService.java +++ b/src/main/java/com/munjaon/server/queue/service/LmsQueueService.java @@ -43,7 +43,11 @@ public class LmsQueueService implements QueueAction { } @Override - public void pushQueue(BasicMessageDto data) { + public void pushQueue(BasicMessageDto data) throws Exception { + queueInstance.pushQueue(data); + } + + public void pushQueue_bak(BasicMessageDto data) { boolean isError = false; try { queueInstance.pushQueue(data); diff --git a/src/main/java/com/munjaon/server/queue/service/MmsQueueService.java b/src/main/java/com/munjaon/server/queue/service/MmsQueueService.java index 7de6956..97d34c2 100644 --- a/src/main/java/com/munjaon/server/queue/service/MmsQueueService.java +++ b/src/main/java/com/munjaon/server/queue/service/MmsQueueService.java @@ -43,7 +43,11 @@ public class MmsQueueService implements QueueAction { } @Override - public void pushQueue(BasicMessageDto data) { + public void pushQueue(BasicMessageDto data) throws Exception { + queueInstance.pushQueue(data); + } + + public void pushQueue_bak(BasicMessageDto data) { boolean isError = false; try { queueInstance.pushQueue(data); diff --git a/src/main/java/com/munjaon/server/queue/service/QueueAction.java b/src/main/java/com/munjaon/server/queue/service/QueueAction.java index 7a8c583..675e955 100644 --- a/src/main/java/com/munjaon/server/queue/service/QueueAction.java +++ b/src/main/java/com/munjaon/server/queue/service/QueueAction.java @@ -10,7 +10,7 @@ public interface QueueAction { boolean isExistQueue(String name); void removeQueue(String name); void addQueue(WriteQueue queue); - void pushQueue(BasicMessageDto data); + void pushQueue(BasicMessageDto data) throws Exception; int saveMessageToTable(BasicMessageDto data); int saveMessageForList(List list); diff --git a/src/main/java/com/munjaon/server/queue/service/SmsQueueService.java b/src/main/java/com/munjaon/server/queue/service/SmsQueueService.java index c11b138..175ade1 100644 --- a/src/main/java/com/munjaon/server/queue/service/SmsQueueService.java +++ b/src/main/java/com/munjaon/server/queue/service/SmsQueueService.java @@ -43,7 +43,11 @@ public class SmsQueueService implements QueueAction { } @Override - public void pushQueue(BasicMessageDto data) { + public void pushQueue(BasicMessageDto data) throws Exception { + queueInstance.pushQueue(data); + } + + public void pushQueue_bak(BasicMessageDto data) { boolean isError = false; try { queueInstance.pushQueue(data); diff --git a/src/main/java/com/munjaon/server/server/service/CollectBackServerService.java b/src/main/java/com/munjaon/server/server/service/CollectBackServerService.java index f527592..9ed1d10 100644 --- a/src/main/java/com/munjaon/server/server/service/CollectBackServerService.java +++ b/src/main/java/com/munjaon/server/server/service/CollectBackServerService.java @@ -296,7 +296,7 @@ public class CollectBackServerService extends Service { } } - private void recvDeliver(SocketChannel channel, ByteBuffer buffer, ConnectUserDto userDto) throws IOException { + private void recvDeliver(SocketChannel channel, ByteBuffer buffer, ConnectUserDto userDto) throws Exception { BasicMessageDto messageDto = new BasicMessageDto(); messageDto.setRouterSeq("40"); messageDto.setServiceType("4"); diff --git a/src/main/java/com/munjaon/server/server/service/CollectServer.java b/src/main/java/com/munjaon/server/server/service/CollectServer.java index 3ad6c20..fff3182 100644 --- a/src/main/java/com/munjaon/server/server/service/CollectServer.java +++ b/src/main/java/com/munjaon/server/server/service/CollectServer.java @@ -115,7 +115,7 @@ public class CollectServer extends Service { if (key.isValid()) { if (key.isAcceptable()) { // 접속일 경우.. - saveSystemLog("CONNECTION IS ACCEPTABLE ... ..."); + saveLog("CONNECTION IS ACCEPTABLE ... ..."); accept(selector, key); } else if (key.isReadable()) { // 수신일 경우.. ConnectUserDto connectUserDto = (ConnectUserDto) key.attachment(); @@ -171,11 +171,11 @@ public class CollectServer extends Service { /* 소켓 취득 */ Socket socket = channel.socket(); InetAddress inetAddress = socket.getInetAddress(); - saveSystemLog("[CLIENT CONNECTION IP : " + inetAddress.getHostAddress() + "]"); + saveLog("[CLIENT CONNECTION IP : " + inetAddress.getHostAddress() + "]"); // Socket 채널을 channel에 수신 등록한다 channel.register(selector, SelectionKey.OP_READ, ConnectUserDto.builder().serviceType(this.serviceType).lastTrafficTime(System.currentTimeMillis()).remoteIP(inetAddress.getHostAddress()).build()); } catch (Exception e) { - saveSystemLog(e.toString()); + saveLog(e.toString()); throw new RuntimeException(e); } } @@ -188,7 +188,7 @@ public class CollectServer extends Service { SocketChannel channel = (SocketChannel) key.channel(); ConnectUserDto userDto = (ConnectUserDto) key.attachment(); if (userDto != null && userDto.getUserId() != null) { - saveSystemLog("[CLIENT USER IS DISCONNECT : " + userDto.toString() + "]"); + saveLog("[CLIENT USER IS DISCONNECT : " + userDto.toString() + "]"); collectUserQueue.removeUser(this.serviceType, userDto.getUserId()); key.attach(null); /* 모니터링 로그 */ @@ -199,7 +199,7 @@ public class CollectServer extends Service { // 키 닫기 key.cancel(); } catch (IOException e) { - saveSystemLog(e.toString()); + saveLog(e.toString()); e.printStackTrace(); } } diff --git a/src/main/java/com/munjaon/server/server/service/HealthCheckServer.java b/src/main/java/com/munjaon/server/server/service/HealthCheckServer.java index 4e11f00..cd4f912 100644 --- a/src/main/java/com/munjaon/server/server/service/HealthCheckServer.java +++ b/src/main/java/com/munjaon/server/server/service/HealthCheckServer.java @@ -102,7 +102,7 @@ public class HealthCheckServer extends Service { break; } - saveSystemLog(msg); + saveLog(msg); if ("Y".equals(slackYn)) { JSONObject payload = new JSONObject(); payload.put("text", msg); @@ -200,8 +200,8 @@ public class HealthCheckServer extends Service { } } } catch (IOException e) { - saveSystemLog("Connect Fail to [PORT : " + port + "]"); - saveSystemLog("ERROR [" + e.getMessage() + "]"); + saveLog("Connect Fail to [PORT : " + port + "]"); + saveLog("ERROR [" + e.getMessage() + "]"); } finally { if (socketChannel != null) { try { diff --git a/src/main/java/com/munjaon/server/server/service/QueueServerService.java b/src/main/java/com/munjaon/server/server/service/QueueServerService.java index b99c38a..1618c73 100644 --- a/src/main/java/com/munjaon/server/server/service/QueueServerService.java +++ b/src/main/java/com/munjaon/server/server/service/QueueServerService.java @@ -76,12 +76,16 @@ public class QueueServerService extends Service { writeQueue.initQueue(); /* 읽기 큐 */ readQueue.initQueue(); + /* 최초 큐정보 */ + saveSystemLog("[INIT_LOAD_BEFORE][QUEUE_NAME : " + writeQueue.getQueueName() + "][WRITE_POSITION : " + writeQueue.getPushCounter() + "][READ_POSITION : " + readQueue.getPopCounter() + "]"); /* 큐 초기화 */ initQueue(); /* 큐 pool에 등록 */ worker.addQueue(writeQueue); /* 메모리큐에서 다시 적재하기 */ loadMemoryQueue(); + /* 최종 큐정보 */ + saveSystemLog("[INIT_LOAD_AFTER][QUEUE_NAME : " + writeQueue.getQueueName() + "][WRITE_POSITION : " + writeQueue.getPushCounter() + "][READ_POSITION : " + readQueue.getPopCounter() + "]"); } } catch (Exception e) { saveSystemLog(e.toString()); @@ -171,6 +175,7 @@ public class QueueServerService extends Service { isQueueInit = true; } if (isQueueInit) { + saveSystemLog("[QUEUE_INIT_START][QUEUE_NAME : " + writeQueue.getQueueName() + "][WRITE_POSITION : " + writeQueue.getPushCounter() + "][READ_POSITION : " + readQueue.getPopCounter() + "]"); /* 큐 백업 */ writeQueue.backupQueue(); /* 커밋 카운트 초기화 */ @@ -182,6 +187,8 @@ public class QueueServerService extends Service { worker.addQueue(writeQueue); /* 메모리큐에서 다시 적재하기 */ loadMemoryQueue(); + + saveSystemLog("[QUEUE_INIT_END][QUEUE_NAME : " + writeQueue.getQueueName() + "][WRITE_POSITION : " + writeQueue.getPushCounter() + "][READ_POSITION : " + readQueue.getPopCounter() + "]"); } } @@ -241,6 +248,8 @@ public class QueueServerService extends Service { worker.removeQueue(writeQueue.getQueueInfo().getQueueName()); /* 자원 해제 */ writeQueue.close(); + + saveSystemLog("[QUEUE_RELEASE][QUEUE_NAME : " + writeQueue.getQueueName() + "]"); } if (readQueue != null) { diff --git a/src/main/java/com/munjaon/server/server/service/ReportServer.java b/src/main/java/com/munjaon/server/server/service/ReportServer.java index 5e49e46..ed7c982 100644 --- a/src/main/java/com/munjaon/server/server/service/ReportServer.java +++ b/src/main/java/com/munjaon/server/server/service/ReportServer.java @@ -185,7 +185,7 @@ public class ReportServer extends Service { if (key.isValid()) { if (key.isAcceptable()) { // 접속일 경우.. - saveSystemLog("CONNECTION IS ACCEPTABLE ... ..."); + saveLog("CONNECTION IS ACCEPTABLE ... ..."); accept(selector, key); } else if (key.isReadable()) { // 수신일 경우.. ReportUserDto reportUserDto = (ReportUserDto) key.attachment(); @@ -218,7 +218,7 @@ public class ReportServer extends Service { if (key.isValid()) { if (key.isAcceptable()) { // 접속일 경우.. - saveSystemLog("CONNECTION IS ACCEPTABLE ... ..."); + saveLog("CONNECTION IS ACCEPTABLE ... ..."); accept(selector, key); } else if (key.isReadable()) { // 수신일 경우.. ReportUserDto reportUserDto = (ReportUserDto) key.attachment(); @@ -245,11 +245,11 @@ public class ReportServer extends Service { /* 소켓 취득 */ Socket socket = channel.socket(); SocketAddress remoteAddr = socket.getRemoteSocketAddress(); - saveSystemLog("Connected to: " + remoteAddr); + saveLog("Connected to: " + remoteAddr); // Socket 채널을 channel에 수신 등록한다 channel.register(selector, SelectionKey.OP_READ, ReportUserDto.builder().lastTrafficTime(System.currentTimeMillis()).remoteIP(remoteAddr.toString()).queuePath(System.getProperty("ROOTPATH") + getProp("QUEUE_PATH")).build()); } catch (Exception e) { - saveSystemLog(e.toString()); + saveLog(e.toString()); throw new RuntimeException(e); } } @@ -261,7 +261,7 @@ public class ReportServer extends Service { try { SocketChannel channel = (SocketChannel) key.channel(); ReportUserDto userDto = (ReportUserDto) key.attachment(); - saveSystemLog("Expire connect user: " + userDto); + saveLog("Expire connect user: " + userDto); if (userDto != null && userDto.getUserId() != null) { reportUserQueue.removeUser(userDto.getUserId()); // connectUserMap.remove(userDto.getUserId()); @@ -274,7 +274,7 @@ public class ReportServer extends Service { // 키 닫기 key.cancel(); } catch (IOException e) { - saveSystemLog(e.toString()); + saveLog(e.toString()); e.printStackTrace(); } } diff --git a/src/main/java/com/munjaon/server/server/task/CollectReadTask.java b/src/main/java/com/munjaon/server/server/task/CollectReadTask.java index 4a83072..afa5df7 100644 --- a/src/main/java/com/munjaon/server/server/task/CollectReadTask.java +++ b/src/main/java/com/munjaon/server/server/task/CollectReadTask.java @@ -178,7 +178,7 @@ public class CollectReadTask implements Callable { messageDto.setUnitCost(String.valueOf(savedMemberDto.getShortPrice())); } - saveSystemLog("[SMS] [MESSAGE : " + messageDto.toString() + "]"); + saveLog("[SMS] [MESSAGE : " + messageDto.toString() + "]"); QueueTypeWorker worker = QueueTypeWorker.find("SMS"); if (worker != null) { worker.pushQueue(messageDto); @@ -210,7 +210,7 @@ public class CollectReadTask implements Callable { messageDto.setUnitCost(String.valueOf(savedMemberDto.getLongPrice())); } - saveSystemLog("[LMS] [MESSAGE : " + messageDto.toString() + "]"); + saveLog("[LMS] [MESSAGE : " + messageDto.toString() + "]"); QueueTypeWorker worker = QueueTypeWorker.find("LMS"); if (worker != null) { worker.pushQueue(messageDto); @@ -258,7 +258,7 @@ public class CollectReadTask implements Callable { } else if (i == 2) { messageDto.setUserFileName03(imagePath + File.separator + fileName); } - saveSystemLog("[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]"); + saveLog("[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]"); } /* 사용자 단가, 발송망 설정 */ @@ -279,7 +279,7 @@ public class CollectReadTask implements Callable { messageDto.setUnitCost(String.valueOf(mmsPrice)); } - saveSystemLog("[MMS] [MESSAGE : " + messageDto.toString() + "]"); + saveLog("[MMS] [MESSAGE : " + messageDto.toString() + "]"); QueueTypeWorker worker = QueueTypeWorker.find("MMS"); if (worker != null) { worker.pushQueue(messageDto); @@ -319,7 +319,7 @@ public class CollectReadTask implements Callable { JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); - saveSystemLog("[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); + saveLog("[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); /* 사용자 단가, 발송망 설정 */ MemberDto savedMemberDto = null; @@ -331,13 +331,13 @@ public class CollectReadTask implements Callable { messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoAtPrice())); } - saveSystemLog("[KAKAO ALARM] [MESSAGE : " + messageDto.toString() + "]"); + saveLog("[KAKAO ALARM] [MESSAGE : " + messageDto.toString() + "]"); QueueTypeWorker worker = QueueTypeWorker.find("KAT"); if (worker != null) { worker.pushQueue(messageDto); channel.write(KakaoMessage.makeDeliverAckBuffer(messageDto.getUserMsgID(), messageDto.getSendStatus())); } else { - saveSystemLog("worker is null"); + saveLog("worker is null"); } } catch (Exception e) { e.printStackTrace(); @@ -373,7 +373,7 @@ public class CollectReadTask implements Callable { JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); - saveSystemLog("[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); + saveLog("[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); /* 사용자 단가, 발송망 설정 */ MemberDto savedMemberDto = null; @@ -385,7 +385,7 @@ public class CollectReadTask implements Callable { messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoFtPrice())); } - saveSystemLog("[KAKAO FRIEND] [MESSAGE : " + messageDto.toString() + "]"); + saveLog("[KAKAO FRIEND] [MESSAGE : " + messageDto.toString() + "]"); QueueTypeWorker worker = QueueTypeWorker.find("KFT"); if (worker != null) { worker.pushQueue(messageDto); @@ -424,7 +424,7 @@ public class CollectReadTask implements Callable { if (svc != null) { memberDto = svc.get(id); } - saveSystemLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); + saveLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); /* Bind Check */ resultCode = checkBind(memberDto, this.serviceType, id, pwd); @@ -432,9 +432,9 @@ public class CollectReadTask implements Callable { if ("00".equals(resultCode)) { boolean isPermit = false; if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) { - saveSystemLog("connectUserDto.getRemoteIP() : " + connectUserDto.getRemoteIP()); - saveSystemLog("Customize Toolbar... : " + memberDto.getAllowIpBasic()); - saveSystemLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend()); + saveLog("connectUserDto.getRemoteIP() : " + connectUserDto.getRemoteIP()); + saveLog("Customize Toolbar... : " + memberDto.getAllowIpBasic()); + saveLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend()); if (memberDto.getAllowIpBasic() != null && connectUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) { isPermit = true; } @@ -465,7 +465,7 @@ public class CollectReadTask implements Callable { } try { - saveSystemLog("[BIND RESULT : " + resultCode + "]"); + saveLog("[BIND RESULT : " + resultCode + "]"); channel.write(Bind.makeBindAckBuffer(resultCode)); if ("00".equals(resultCode) == false) { expireConnectUser(); diff --git a/src/main/java/com/munjaon/server/server/task/CollectServerTask.java b/src/main/java/com/munjaon/server/server/task/CollectServerTask.java index 48e6451..6d6ba76 100644 --- a/src/main/java/com/munjaon/server/server/task/CollectServerTask.java +++ b/src/main/java/com/munjaon/server/server/task/CollectServerTask.java @@ -58,9 +58,9 @@ public class CollectServerTask extends Thread { this.serviceType = serviceType; this.logger = logger; if (connectUserDto.isLogin()) { - saveSystemLog("[COLLECT SERVER READ] [ID : " + connectUserDto.getUserId() + "]"); + saveLog("[COLLECT SERVER READ] [ID : " + connectUserDto.getUserId() + "]"); } else { - saveSystemLog("[COLLECT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]"); + saveLog("[COLLECT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]"); } } @@ -120,7 +120,7 @@ public class CollectServerTask extends Thread { @Override public void run() { - saveSystemLog(printTaskLog() + "[### Start ### ### ### ### ### ### ###]"); + saveLog(printTaskLog() + "[### Start ### ### ### ### ### ### ###]"); /* 0. 최초 RUN Flag 체크 */ reloadRunFlag(); /* BIND 체크 및 처리 */ @@ -132,9 +132,9 @@ public class CollectServerTask extends Thread { try { /* 2. Packet Timeout Check */ if (checkTimeOut()) { - saveSystemLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]"); + saveLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]"); expireConnectUser(); - saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); + saveLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); break; } /* 3. HeadBuffer 읽기 */ @@ -160,7 +160,7 @@ public class CollectServerTask extends Thread { /* 세션 만료 여부 */ this.isExpiredYn = true; this.IS_ERROR = true; - saveSystemLog(e); + saveLog(e); } /* RUN Flag 체크 */ reloadRunFlag(); @@ -171,7 +171,7 @@ public class CollectServerTask extends Thread { if (IS_ERROR) { expireConnectUser(); } - saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); + saveLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); } private boolean checkTimeOut() { @@ -186,7 +186,7 @@ public class CollectServerTask extends Thread { /* 서비스 중지여부 체크 */ if (isExpireService()) { expireConnectUser(); - saveSystemLog(printTaskLog() + "[isExpireService : Expired ... ... ... ... ... ... ...]"); + saveLog(printTaskLog() + "[isExpireService : Expired ... ... ... ... ... ... ...]"); return; } switch (this.serviceType) { @@ -357,7 +357,7 @@ public class CollectServerTask extends Thread { } else if (i == 2) { messageDto.setUserFileName03(imagePath + File.separator + fileName); } - saveSystemLog(printTaskLog() + "[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]"); + saveLog(printTaskLog() + "[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]"); } /* 사용자 단가, 발송망 설정 */ @@ -419,7 +419,7 @@ public class CollectServerTask extends Thread { JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); - saveSystemLog(printTaskLog() + "[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); + saveLog(printTaskLog() + "[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); /* 사용자 단가, 발송망 설정 */ MemberDto savedMemberDto = null; @@ -474,7 +474,7 @@ public class CollectServerTask extends Thread { JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); - saveSystemLog(printTaskLog() + "[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); + saveLog(printTaskLog() + "[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); /* 사용자 단가, 발송망 설정 */ MemberDto savedMemberDto = null; @@ -506,9 +506,9 @@ public class CollectServerTask extends Thread { } ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH); channel.read(bodyBuffer); - saveSystemLog(printTaskLog() + "[COLLECTOR LINK CHECK RECEIVE ... ... ... ... ... ... ...]"); + saveLog(printTaskLog() + "[COLLECTOR LINK CHECK RECEIVE ... ... ... ... ... ... ...]"); channel.write(LinkCheck.makeLinkCheckAckBuffer()); - saveSystemLog(printTaskLog() + "[COLLECTOR LINK CHECK ACK SEND ... ... ... ... ... ... ...]"); + saveLog(printTaskLog() + "[COLLECTOR LINK CHECK ACK SEND ... ... ... ... ... ... ...]"); connectUserDto.updateLastTrafficTime(); } @@ -522,7 +522,7 @@ public class CollectServerTask extends Thread { String id = Bind.getBindId(bindBuffer); String pwd = Bind.getBindPwd(bindBuffer); - saveSystemLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); + saveLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); MemberService svc = (MemberService) CacheService.LOGIN_SERVICE.getService(); MemberDto memberDto = null; @@ -537,9 +537,9 @@ public class CollectServerTask extends Thread { if ("00".equals(resultCode)) { boolean isPermit = false; if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) { - saveSystemLog(printTaskLog() + "[REMOTE IP : " + connectUserDto.getRemoteIP() + "]"); - saveSystemLog(printTaskLog() + "[ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]"); - saveSystemLog(printTaskLog() + "[ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]"); + saveLog(printTaskLog() + "[REMOTE IP : " + connectUserDto.getRemoteIP() + "]"); + saveLog(printTaskLog() + "[ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]"); + saveLog(printTaskLog() + "[ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]"); if (memberDto.getAllowIpBasic() != null && connectUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) { isPermit = true; } @@ -568,7 +568,7 @@ public class CollectServerTask extends Thread { } try { - saveSystemLog(printTaskLog() + "[BIND RESULT : " + resultCode + "]"); + saveLog(printTaskLog() + "[BIND RESULT : " + resultCode + "]"); channel.write(Bind.makeBindAckBuffer(resultCode)); if ("00".equals(resultCode)) { /* BIND 성공인 경우 사용자 Pool에 저장 */ @@ -579,7 +579,7 @@ public class CollectServerTask extends Thread { /* 모니터링 로그 */ HealthCheckServer.saveMonitorLog("[COLLECT SERVER][SERVICE TYPE : " + this.serviceType + "][ID : " + connectUserDto.getUserId() + "][BIND RESULT : " + resultCode + "]"); } catch (IOException e) { - saveSystemLog(e); + saveLog(e); throw new RuntimeException(e); } } diff --git a/src/main/java/com/munjaon/server/server/task/ReportBindTask.java b/src/main/java/com/munjaon/server/server/task/ReportBindTask.java index 9d0f298..0d6fe32 100644 --- a/src/main/java/com/munjaon/server/server/task/ReportBindTask.java +++ b/src/main/java/com/munjaon/server/server/task/ReportBindTask.java @@ -63,7 +63,7 @@ public class ReportBindTask extends ReportTask { if (svc != null) { memberDto = svc.get(id); } - saveSystemLog("[" + this.taskName + "][BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); + saveLog("[" + this.taskName + "][BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); /* Bind Check */ resultCode = checkBind(memberDto, id, pwd); @@ -71,9 +71,9 @@ public class ReportBindTask extends ReportTask { if ("00".equals(resultCode)) { boolean isPermit = false; if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) { - saveSystemLog("[" + this.taskName + "][REMOTE IP : " + reportUserDto.getRemoteIP() + "]"); - saveSystemLog("[" + this.taskName + "][ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]"); - saveSystemLog("[" + this.taskName + "][ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]"); + saveLog("[" + this.taskName + "][REMOTE IP : " + reportUserDto.getRemoteIP() + "]"); + saveLog("[" + this.taskName + "][ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]"); + saveLog("[" + this.taskName + "][ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]"); if (memberDto.getAllowIpBasic() != null && reportUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) { isPermit = true; } @@ -107,7 +107,7 @@ public class ReportBindTask extends ReportTask { } try { - saveSystemLog("[" + this.taskName + "][BIND RESULT : " + resultCode + "]"); + saveLog("[" + this.taskName + "][BIND RESULT : " + resultCode + "]"); channel.write(Bind.makeBindAckBuffer(resultCode)); if ("00".equals(resultCode)) { /* BIND 성공인 경우 사용자 Pool에 저장 */ @@ -118,7 +118,7 @@ public class ReportBindTask extends ReportTask { /* 모니터링 로그 */ HealthCheckServer.saveMonitorLog("[REPORT SERVER][ID : " + reportUserDto.getUserId() + "][BIND RESULT : " + resultCode + "]"); } catch (IOException e) { - saveSystemLog(e); + saveLog(e); throw new RuntimeException(e); } } diff --git a/src/main/java/com/munjaon/server/server/task/ReportLinkCheckTask.java b/src/main/java/com/munjaon/server/server/task/ReportLinkCheckTask.java index 9825641..5b99715 100644 --- a/src/main/java/com/munjaon/server/server/task/ReportLinkCheckTask.java +++ b/src/main/java/com/munjaon/server/server/task/ReportLinkCheckTask.java @@ -32,7 +32,7 @@ public class ReportLinkCheckTask extends ReportTask { if (reportUserDto.isAlive() == 2) { channel.write(LinkCheck.makeLinkCheckBuffer()); - saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND LINK CHECK ... ... ... ... ... ... ...]"); + saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND LINK CHECK ... ... ... ... ... ... ...]"); /* 패킷 전송 시간 체크위한 설정(3초간 유지) */ SEND_CYCLE_CHECK_TIME = System.currentTimeMillis(); /* Packet 전송했는지 여부 */ @@ -55,13 +55,13 @@ public class ReportLinkCheckTask extends ReportTask { } else if (size == 0) { Thread.sleep(1); if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME >= ServerConfig.REPORT_EXEC_CYCLE_TIME) { - saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]"); + saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]"); expireConnectUser(); this.isExpiredYn = true; break; } } else { - saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]"); + saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]"); expireConnectUser(); throw new IOException("[ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]"); } @@ -72,7 +72,7 @@ public class ReportLinkCheckTask extends ReportTask { ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH); int size = channel.read(bodyBuffer); if (size > 0) { - saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE LINK CHECK ACK ... ... ... ... ... ... ...]"); + saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE LINK CHECK ACK ... ... ... ... ... ... ...]"); reportUserDto.updateLastTrafficTime(); this.isPacketSendYn = false; } diff --git a/src/main/java/com/munjaon/server/server/task/ReportQueueTask.java b/src/main/java/com/munjaon/server/server/task/ReportQueueTask.java index 6e88fa0..6cb8b94 100644 --- a/src/main/java/com/munjaon/server/server/task/ReportQueueTask.java +++ b/src/main/java/com/munjaon/server/server/task/ReportQueueTask.java @@ -60,7 +60,7 @@ public class ReportQueueTask implements Runnable { } else { builder.append(",").append(dto.getMsgId()); } - saveSystemLog("reportDto : " + dto.toString()); + saveLog("reportDto : " + dto.toString()); reportQueue.pushReportToQueue(dto); } catch (Exception e) { throw new RuntimeException(e); diff --git a/src/main/java/com/munjaon/server/server/task/ReportReadTask.java b/src/main/java/com/munjaon/server/server/task/ReportReadTask.java index 1f4604a..c7ec26f 100644 --- a/src/main/java/com/munjaon/server/server/task/ReportReadTask.java +++ b/src/main/java/com/munjaon/server/server/task/ReportReadTask.java @@ -76,7 +76,7 @@ public class ReportReadTask implements Callable { ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH); int size = channel.read(bodyBuffer); if (size > 0) { - saveSystemLog("Recv link check"); + saveLog("Recv link check"); reportUserDto.updateLastTrafficTime(); } } catch (Exception e) { @@ -92,7 +92,7 @@ public class ReportReadTask implements Callable { return; } - saveSystemLog("recv report"); + saveLog("recv report"); ReportQueue reportQueue = reportUserDto.getReportQueue(); reportUserDto.updateLastTrafficTime(); if (reportQueue != null) { @@ -137,7 +137,7 @@ public class ReportReadTask implements Callable { if (svc != null) { memberDto = svc.get(id); } - saveSystemLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); + saveLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); /* Bind Check */ resultCode = checkBind(memberDto, id, pwd); @@ -145,9 +145,9 @@ public class ReportReadTask implements Callable { if ("00".equals(resultCode)) { boolean isPermit = false; if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) { - saveSystemLog("connectUserDto.getRemoteIP() : " + reportUserDto.getRemoteIP()); - saveSystemLog("Customize Toolbar... : " + memberDto.getAllowIpBasic()); - saveSystemLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend()); + saveLog("connectUserDto.getRemoteIP() : " + reportUserDto.getRemoteIP()); + saveLog("Customize Toolbar... : " + memberDto.getAllowIpBasic()); + saveLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend()); if (memberDto.getAllowIpBasic() != null && reportUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) { isPermit = true; } @@ -182,7 +182,7 @@ public class ReportReadTask implements Callable { } try { - saveSystemLog("Bind ResultCode : " + resultCode); + saveLog("Bind ResultCode : " + resultCode); channel.write(Bind.makeBindAckBuffer(resultCode)); if ("00".equals(resultCode) == false) { expireConnectUser(); @@ -202,8 +202,8 @@ public class ReportReadTask implements Callable { String id = Bind.getBindId(bindBuffer); String pwd = Bind.getBindPwd(bindBuffer); - saveSystemLog("Bind id : " + id); - saveSystemLog("Bind pwd : " + pwd); + saveLog("Bind id : " + id); + saveLog("Bind pwd : " + pwd); if (id == null || pwd == null) { resultCode = "50"; } else { @@ -237,7 +237,7 @@ public class ReportReadTask implements Callable { } try { - saveSystemLog("Bind ResultCode : " + resultCode); + saveLog("Bind ResultCode : " + resultCode); channel.write(Bind.makeBindAckBuffer(resultCode)); if ("00".equals(resultCode) == false) { expireConnectUser(); diff --git a/src/main/java/com/munjaon/server/server/task/ReportResultTask.java b/src/main/java/com/munjaon/server/server/task/ReportResultTask.java index aaebe93..6c02737 100644 --- a/src/main/java/com/munjaon/server/server/task/ReportResultTask.java +++ b/src/main/java/com/munjaon/server/server/task/ReportResultTask.java @@ -43,19 +43,19 @@ public class ReportResultTask extends ReportTask { String command = Header.getCommand(headBuffer); switch (Integer.parseInt(command)) { case 6 : recvReport(); break; - default: saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][INVALID REQUEST][command : " + command + "]"); + default: saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][INVALID REQUEST][command : " + command + "]"); expireConnectUser(); break; } } else if (size == 0) { Thread.sleep(1); if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME >= ServerConfig.REPORT_EXEC_CYCLE_TIME) { - saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]"); + saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]"); expireConnectUser(); this.isExpiredYn = true; break; } } else { - saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]"); + saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]"); expireConnectUser(); throw new IOException("[ID : " + this.reportUserDto.getUserId() + "][recvInterest : size is zero]"); } @@ -69,12 +69,12 @@ public class ReportResultTask extends ReportTask { return; } - saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE REPORT ACK ... ... ... ... ... ... ...]"); + saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE REPORT ACK ... ... ... ... ... ... ...]"); ReportQueue reportQueue = reportUserDto.getReportQueue(); reportUserDto.updateLastTrafficTime(); this.isPacketSendYn = false; if (reportQueue != null && this.reportDto != null) { - saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE REPORT : " + this.reportDto.toString() + "]"); + saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][RECEIVE REPORT : " + this.reportDto.toString() + "]"); reportQueue.addReadCounter(); } } @@ -89,7 +89,7 @@ public class ReportResultTask extends ReportTask { if (reportDto == null) { return; } - saveSystemLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][REPORT SEND : " + reportDto.toString() + "]"); + saveLog("[" + this.taskName + "][ID : " + this.reportUserDto.getUserId() + "][REPORT SEND : " + reportDto.toString() + "]"); ByteBuffer reportBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + Report.REPORT_BODY_LENGTH); Packet.setDefaultByte(reportBuffer); Header.putHeader(reportBuffer, Header.COMMAND_REPORT, Report.REPORT_BODY_LENGTH); 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 9c8546f..8306491 100644 --- a/src/main/java/com/munjaon/server/server/task/ReportServerTask.java +++ b/src/main/java/com/munjaon/server/server/task/ReportServerTask.java @@ -61,9 +61,9 @@ public class ReportServerTask extends Thread { this.reportQueue = reportUserDto.getReportQueue(); this.logger = logger; if (reportUserDto.isLogin()) { - saveSystemLog("[REPORT SERVER READ] [ID : " + reportUserDto.getUserId() + "]"); + saveLog("[REPORT SERVER READ] [ID : " + reportUserDto.getUserId() + "]"); } else { - saveSystemLog("[REPORT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]"); + saveLog("[REPORT SERVER READ] [FIRST CONNECTION ... ... ... ... ... ... ...]"); } } @@ -102,7 +102,7 @@ public class ReportServerTask extends Thread { @Override public void run() { - saveSystemLog(printTaskLog() + "[### Start ### ### ### ### ### ### ###]"); + saveLog(printTaskLog() + "[### Start ### ### ### ### ### ### ###]"); /* 최초 RUN Flag 체크 */ reloadRunFlag(); try { @@ -116,9 +116,9 @@ public class ReportServerTask extends Thread { } /* 2. Packet Timeout Check */ if (checkTimeOut()) { - saveSystemLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]"); + saveLog(printTaskLog() + "[checkTimeOut : Expired ... ... ... ... ... ... ...]"); expireConnectUser(); - saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); + saveLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); break; } @@ -135,7 +135,7 @@ public class ReportServerTask extends Thread { /* 세션 만료 여부 */ this.isExpiredYn = true; this.IS_ERROR = true; - saveSystemLog(e); + saveLog(e); } /* 중요 : 사용자 Thread 실행모드 Off */ reportUserDto.setRunningMode(false); @@ -143,7 +143,7 @@ public class ReportServerTask extends Thread { if (IS_ERROR) { expireConnectUser(); } - saveSystemLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); + saveLog(printTaskLog() + "[### End ### ### ### ### ### ### ###]"); } private boolean checkTimeOut() { @@ -217,7 +217,7 @@ public class ReportServerTask extends Thread { if (svc != null) { memberDto = svc.get(id); } - saveSystemLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); + saveLog(printTaskLog() + "[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); /* Bind Check */ resultCode = checkBind(memberDto, id, pwd); @@ -225,9 +225,9 @@ public class ReportServerTask extends Thread { if ("00".equals(resultCode)) { boolean isPermit = false; if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) { - saveSystemLog(printTaskLog() + "[REMOTE IP : " + reportUserDto.getRemoteIP() + "]"); - saveSystemLog(printTaskLog() + "[ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]"); - saveSystemLog(printTaskLog() + "[ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]"); + saveLog(printTaskLog() + "[REMOTE IP : " + reportUserDto.getRemoteIP() + "]"); + saveLog(printTaskLog() + "[ALLOW IP BASIC : " + memberDto.getAllowIpBasic() + "]"); + saveLog(printTaskLog() + "[ALLOW IP EXTEND : " + memberDto.getAllowIpExtend() + "]"); if (memberDto.getAllowIpBasic() != null && reportUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) { isPermit = true; } @@ -257,11 +257,11 @@ public class ReportServerTask extends Thread { } } catch (Exception e) { resultCode = "10"; - saveSystemLog(e); + saveLog(e); } try { - saveSystemLog(printTaskLog() + "[BIND RESULT : " + resultCode + "]"); + saveLog(printTaskLog() + "[BIND RESULT : " + resultCode + "]"); channel.write(Bind.makeBindAckBuffer(resultCode)); if ("00".equals(resultCode)) { /* BIND 성공인 경우 사용자 Pool에 저장 */ @@ -272,7 +272,7 @@ public class ReportServerTask extends Thread { /* 모니터링 로그 */ HealthCheckServer.saveMonitorLog("[REPORT SERVER][ID : " + reportUserDto.getUserId() + "][BIND RESULT : " + resultCode + "]"); } catch (IOException e) { - saveSystemLog(e); + saveLog(e); throw new RuntimeException(e); } } @@ -305,7 +305,7 @@ public class ReportServerTask extends Thread { switch (Integer.parseInt(command)) { case 6 : recvReport(channel); break; case 8 : recvLinkCheck(channel); break; - default: saveSystemLog(printTaskLog() + "[INVALID REQUEST][command : " + command + "]"); + default: saveLog(printTaskLog() + "[INVALID REQUEST][command : " + command + "]"); expireConnectUser(); break; } /* 마지막 패킷 수신시간 체크 */ @@ -313,13 +313,13 @@ public class ReportServerTask extends Thread { } else if (size == 0) { Thread.sleep(1); if (System.currentTimeMillis() - SEND_CYCLE_CHECK_TIME >= ServerConfig.REPORT_EXEC_CYCLE_TIME) { - saveSystemLog(printTaskLog() + "[SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]"); + saveLog(printTaskLog() + "[SEND_CYCLE_CHECK_TIME IS OVER : 3000ms]"); expireConnectUser(); this.isExpiredYn = true; break; } } else { - saveSystemLog(printTaskLog() + "[recvInterest : size is zero]"); + saveLog(printTaskLog() + "[recvInterest : size is zero]"); expireConnectUser(); throw new IOException("[recvInterest : size is zero]"); } @@ -330,7 +330,7 @@ public class ReportServerTask extends Thread { ByteBuffer bodyBuffer = ByteBuffer.allocate(LinkCheck.LINK_CHECK_ACK_BODY_LENGTH); int size = channel.read(bodyBuffer); if (size > 0) { - saveSystemLog(printTaskLog() + "[RECEIVE LINK CHECK ACK ... ... ... ... ... ... ...]"); + saveLog(printTaskLog() + "[RECEIVE LINK CHECK ACK ... ... ... ... ... ... ...]"); reportUserDto.updateLastTrafficTime(); this.isPacketSendYn = false; } @@ -343,12 +343,12 @@ public class ReportServerTask extends Thread { return; } - saveSystemLog(printTaskLog() + "[RECEIVE REPORT ACK ... ... ... ... ... ... ...]"); + saveLog(printTaskLog() + "[RECEIVE REPORT ACK ... ... ... ... ... ... ...]"); ReportQueue reportQueue = reportUserDto.getReportQueue(); reportUserDto.updateLastTrafficTime(); this.isPacketSendYn = false; if (reportQueue != null && this.reportDto != null) { - saveSystemLog(printTaskLog() + "[RECEIVE REPORT : " + this.reportDto.toString() + "]"); + saveLog(printTaskLog() + "[RECEIVE REPORT : " + this.reportDto.toString() + "]"); reportQueue.addReadCounter(); } } @@ -359,7 +359,7 @@ public class ReportServerTask extends Thread { } if (reportUserDto.isAlive() == 2) { channel.write(LinkCheck.makeLinkCheckBuffer()); - saveSystemLog(printTaskLog() + "[SEND LINK CHECK ... ... ... ... ... ... ...]"); + saveLog(printTaskLog() + "[SEND LINK CHECK ... ... ... ... ... ... ...]"); SEND_CYCLE_CHECK_TIME = System.currentTimeMillis(); /* Packet 전송했는지 여부 */ isPacketSendYn = true; @@ -369,7 +369,7 @@ public class ReportServerTask extends Thread { if (reportDto == null) { return; } - saveSystemLog(printTaskLog() + "[REPORT SEND : " + reportDto.toString() + "]"); + saveLog(printTaskLog() + "[REPORT SEND : " + reportDto.toString() + "]"); ByteBuffer reportBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + Report.REPORT_BODY_LENGTH); Packet.setDefaultByte(reportBuffer); Header.putHeader(reportBuffer, Header.COMMAND_REPORT, Report.REPORT_BODY_LENGTH); @@ -388,7 +388,7 @@ public class ReportServerTask extends Thread { } try { SocketChannel channel = (SocketChannel) key.channel(); - saveSystemLog("[ReportServerTask]Expire connect user: " + reportUserDto); + saveLog("[ReportServerTask]Expire connect user: " + reportUserDto); if (reportUserDto != null) { if (reportUserDto.getUserId() != null) { reportUserQueue.removeUser(reportUserDto.getUserId()); @@ -404,7 +404,7 @@ public class ReportServerTask extends Thread { // 키 닫기 key.cancel(); } catch (IOException e) { - saveSystemLog(e); + saveLog(e); } } diff --git a/src/main/java/com/munjaon/server/server/task/SendReadTask.java b/src/main/java/com/munjaon/server/server/task/SendReadTask.java index 32ed9ff..38e2312 100644 --- a/src/main/java/com/munjaon/server/server/task/SendReadTask.java +++ b/src/main/java/com/munjaon/server/server/task/SendReadTask.java @@ -99,7 +99,7 @@ public class SendReadTask implements Runnable { private boolean isExpireService() { ConnectUserDto checkConnectUserDto = collectUserQueue.getUser(this.serviceType, this.connectUserDto.getUserId()); MemberDto memberDto = checkConnectUserDto.getMemberDto(); - saveSystemLog("[isExpireService : " + memberDto.toString() + "]"); + saveLog("[isExpireService : " + memberDto.toString() + "]"); if (memberDto == null) { return true; } @@ -171,7 +171,7 @@ public class SendReadTask implements Runnable { messageDto.setUnitCost(String.valueOf(savedMemberDto.getShortPrice())); } - saveSystemLog("[SMS] [MESSAGE : " + messageDto.toString() + "]"); + saveLog("[SMS] [MESSAGE : " + messageDto.toString() + "]"); QueueTypeWorker worker = QueueTypeWorker.find("SMS"); if (worker != null) { worker.pushQueue(messageDto); @@ -203,7 +203,7 @@ public class SendReadTask implements Runnable { messageDto.setUnitCost(String.valueOf(savedMemberDto.getLongPrice())); } - saveSystemLog("[LMS] [MESSAGE : " + messageDto.toString() + "]"); + saveLog("[LMS] [MESSAGE : " + messageDto.toString() + "]"); QueueTypeWorker worker = QueueTypeWorker.find("LMS"); if (worker != null) { worker.pushQueue(messageDto); @@ -251,7 +251,7 @@ public class SendReadTask implements Runnable { } else if (i == 2) { messageDto.setUserFileName03(imagePath + File.separator + fileName); } - saveSystemLog("[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]"); + saveLog("[MMS IMAGE] [File : " + fileName + ", Size : " + fileSize + "]"); } /* 사용자 단가, 발송망 설정 */ @@ -272,7 +272,7 @@ public class SendReadTask implements Runnable { messageDto.setUnitCost(String.valueOf(mmsPrice)); } - saveSystemLog("[MMS] [MESSAGE : " + messageDto.toString() + "]"); + saveLog("[MMS] [MESSAGE : " + messageDto.toString() + "]"); QueueTypeWorker worker = QueueTypeWorker.find("MMS"); if (worker != null) { worker.pushQueue(messageDto); @@ -312,7 +312,7 @@ public class SendReadTask implements Runnable { JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); - saveSystemLog("[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); + saveLog("[KAT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); /* 사용자 단가, 발송망 설정 */ MemberDto savedMemberDto = null; @@ -324,13 +324,13 @@ public class SendReadTask implements Runnable { messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoAtPrice())); } - saveSystemLog("[KAKAO ALARM] [MESSAGE : " + messageDto.toString() + "]"); + saveLog("[KAKAO ALARM] [MESSAGE : " + messageDto.toString() + "]"); QueueTypeWorker worker = QueueTypeWorker.find("KAT"); if (worker != null) { worker.pushQueue(messageDto); channel.write(KakaoMessage.makeDeliverAckBuffer(messageDto.getUserMsgID(), messageDto.getSendStatus())); } else { - saveSystemLog("worker is null"); + saveLog("worker is null"); } } catch (Exception e) { e.printStackTrace(); @@ -366,7 +366,7 @@ public class SendReadTask implements Runnable { JobFileFactory.saveFileForByteBuffer(jsonPath, fileName, fileBuffer); messageDto.setKakaoJsonFile(jsonPath + File.separator + fileName); - saveSystemLog("[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); + saveLog("[KFT JSON] [File : " + fileName + ", Size : " + fileSize + "]"); /* 사용자 단가, 발송망 설정 */ MemberDto savedMemberDto = null; @@ -378,7 +378,7 @@ public class SendReadTask implements Runnable { messageDto.setUnitCost(String.valueOf(savedMemberDto.getKakaoFtPrice())); } - saveSystemLog("[KAKAO FRIEND] [MESSAGE : " + messageDto.toString() + "]"); + saveLog("[KAKAO FRIEND] [MESSAGE : " + messageDto.toString() + "]"); QueueTypeWorker worker = QueueTypeWorker.find("KFT"); if (worker != null) { worker.pushQueue(messageDto); @@ -417,7 +417,7 @@ public class SendReadTask implements Runnable { if (svc != null) { memberDto = svc.get(id); } - saveSystemLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); + saveLog("[BIND REQUEST] [ID : " + id + ", PWD : " + pwd + "]"); /* Bind Check */ resultCode = checkBind(memberDto, this.serviceType, id, pwd); @@ -425,9 +425,9 @@ public class SendReadTask implements Runnable { if ("00".equals(resultCode)) { boolean isPermit = false; if (memberDto.getIpLimitYn() == null || "Y".equals(memberDto.getIpLimitYn())) { - saveSystemLog("connectUserDto.getRemoteIP() : " + connectUserDto.getRemoteIP()); - saveSystemLog("Customize Toolbar... : " + memberDto.getAllowIpBasic()); - saveSystemLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend()); + saveLog("connectUserDto.getRemoteIP() : " + connectUserDto.getRemoteIP()); + saveLog("Customize Toolbar... : " + memberDto.getAllowIpBasic()); + saveLog("memberDto.getAllowIpExtend() : " + memberDto.getAllowIpExtend()); if (memberDto.getAllowIpBasic() != null && connectUserDto.getRemoteIP().equals(memberDto.getAllowIpBasic())) { isPermit = true; } @@ -458,7 +458,7 @@ public class SendReadTask implements Runnable { } try { - saveSystemLog("[BIND RESULT : " + resultCode + "]"); + saveLog("[BIND RESULT : " + resultCode + "]"); channel.write(Bind.makeBindAckBuffer(resultCode)); if ("00".equals(resultCode) == false) { expireConnectUser(); diff --git a/src/main/java/com/munjaon/server/server/task/StatusCheckTask.java b/src/main/java/com/munjaon/server/server/task/StatusCheckTask.java index 15b7b1d..4e109bc 100644 --- a/src/main/java/com/munjaon/server/server/task/StatusCheckTask.java +++ b/src/main/java/com/munjaon/server/server/task/StatusCheckTask.java @@ -27,28 +27,28 @@ public class StatusCheckTask implements Runnable { @Override public void run() { - saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is starting ... ...]"); + saveLog("[" + this.serviceType + "][USER STATUS CHECK is starting ... ...]"); List userList = collectUserQueue.getUsers(this.serviceType); if (userList == null || userList.isEmpty()) { - saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is empty ... ...]"); - saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is ended ... ...]"); + saveLog("[" + this.serviceType + "][USER STATUS CHECK is empty ... ...]"); + saveLog("[" + this.serviceType + "][USER STATUS CHECK is ended ... ...]"); return; } MemberService svc = (MemberService) CacheService.LOGIN_SERVICE.getService(); for (ConnectUserDto user : userList) { MemberDto savedMemberDto = user.getMemberDto(); - saveSystemLog("[" + this.serviceType + "][USER PREVIOUS STATUS : " + savedMemberDto.toString() + "]"); + saveLog("[" + this.serviceType + "][USER PREVIOUS STATUS : " + savedMemberDto.toString() + "]"); MemberDto newMemberDto = svc.get(savedMemberDto.getMberId()); - saveSystemLog("[" + this.serviceType + "][USER NEW STATUS : " + newMemberDto.toString() + "]"); + saveLog("[" + this.serviceType + "][USER NEW STATUS : " + newMemberDto.toString() + "]"); if (newMemberDto == null) { savedMemberDto.setMberSttus("N"); } else { user.setMemberDto(newMemberDto); } - saveSystemLog("[" + this.serviceType + "][USER AFTER STATUS : " + savedMemberDto.toString() + "]"); + saveLog("[" + this.serviceType + "][USER AFTER STATUS : " + savedMemberDto.toString() + "]"); } - saveSystemLog("[" + this.serviceType + "][USER STATUS CHECK is ended ... ...]"); + saveLog("[" + this.serviceType + "][USER STATUS CHECK is ended ... ...]"); } private void saveSystemLog(Object obj) {