From 057bc010c0e37627accfbd70ca76758b565dc22b Mon Sep 17 00:00:00 2001 From: jangdongsin Date: Fri, 11 Oct 2024 19:53:48 +0900 Subject: [PATCH] =?UTF-8?q?=ED=99=94=EB=A9=B4=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=EC=B6=9C=EB=A0=A5=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/service/CollectClientService.java | 84 +++++++++---------- .../server/service/ReportClientService.java | 8 +- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/munjaon/client/server/service/CollectClientService.java b/src/main/java/com/munjaon/client/server/service/CollectClientService.java index e45b655..10211c0 100644 --- a/src/main/java/com/munjaon/client/server/service/CollectClientService.java +++ b/src/main/java/com/munjaon/client/server/service/CollectClientService.java @@ -231,8 +231,8 @@ public class CollectClientService extends Service { int checkCommonCode = MessageCheckUtil.validateMessageForCommon(data); int checkMsgCode = MessageCheckUtil.validateMessageForSms(data); if (checkCommonCode != ErrorCode.OK.getCode() || checkMsgCode != ErrorCode.OK.getCode()) { - saveSystemLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "]"); - saveSystemLog("[MESSAGE DATA : " + data.toString() + "]"); + saveLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "]"); + saveLog("[MESSAGE DATA : " + data.toString() + "]"); /* 전송처리 */ worker.updateToDeliver(data.getMsgId()); /* 실패처리 */ @@ -252,23 +252,23 @@ public class CollectClientService extends Service { ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + SmsMessage.DELIVER_SMS_ACK_BODY_LENGTH); Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, SmsMessage.DELIVER_SMS_BODY_LENGTH); SmsMessage.makeDataForDeliver(sendBuffer, data); - saveSystemLog("[MESSAGE SEND] [... ...]"); - saveSystemLog("[MESSAGE DATA : " + data.toString() + "]"); + saveLog("[MESSAGE SEND] [... ...]"); + saveLog("[MESSAGE DATA : " + data.toString() + "]"); socketChannel.write(sendBuffer); long MSG_SEND_TIME = System.currentTimeMillis(); while (true) { if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) { - saveSystemLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]"); + saveLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]"); throw new RuntimeException("messageSendTimeOut : Expired ... ... ... ... ... ... ..."); } int recvCount = socketChannel.read(recvBuffer); if (recvCount == -1) { - saveSystemLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]"); + saveLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]"); throw new RuntimeException("DELIVER ERROR"); } else if (recvCount > 0) { setDeliverMsgId(data.getMsgId()); // worker.updateToDeliver(data.getMsgId()); - saveSystemLog("[MESSAGE SEND] [SUCCESS]"); + saveLog("[MESSAGE SEND] [SUCCESS]"); lastPacketSendTime = System.currentTimeMillis(); break; } @@ -287,8 +287,8 @@ public class CollectClientService extends Service { int checkCommonCode = MessageCheckUtil.validateMessageForCommon(data); int checkMsgCode = MessageCheckUtil.validateMessageForMedia(data); if (checkCommonCode != ErrorCode.OK.getCode() || checkMsgCode != ErrorCode.OK.getCode()) { - saveSystemLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "]"); - saveSystemLog("[MESSAGE DATA : " + data.toString() + "]"); + saveLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "]"); + saveLog("[MESSAGE DATA : " + data.toString() + "]"); /* 전송처리 */ worker.updateToDeliver(data.getMsgId()); /* 실패처리 */ @@ -308,23 +308,23 @@ public class CollectClientService extends Service { ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + LmsMessage.DELIVER_LMS_ACK_BODY_LENGTH); Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, LmsMessage.DELIVER_LMS_BODY_LENGTH); LmsMessage.makeDataForDeliver(sendBuffer, data); - saveSystemLog("[MESSAGE SEND] [... ...]"); - saveSystemLog("[MESSAGE DATA : " + data.toString() + "]"); + saveLog("[MESSAGE SEND] [... ...]"); + saveLog("[MESSAGE DATA : " + data.toString() + "]"); socketChannel.write(sendBuffer); long MSG_SEND_TIME = System.currentTimeMillis(); while (true) { if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) { - saveSystemLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]"); + saveLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]"); throw new RuntimeException("messageSendTimeOut : Expired ... ... ... ... ... ... ..."); } int recvCount = socketChannel.read(recvBuffer); if (recvCount == -1) { - saveSystemLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]"); + saveLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]"); throw new RuntimeException("DELIVER ERROR"); } else if (recvCount > 0) { setDeliverMsgId(data.getMsgId()); // worker.updateToDeliver(data.getMsgId()); - saveSystemLog("[MESSAGE SEND] [SUCCESS]"); + saveLog("[MESSAGE SEND] [SUCCESS]"); lastPacketSendTime = System.currentTimeMillis(); break; } @@ -354,8 +354,8 @@ public class CollectClientService extends Service { int checkMsgCode = MessageCheckUtil.validateMessageForMedia(data); int checkImageCode = MessageCheckUtil.validateMessageForImage(data, path); if (checkCommonCode != ErrorCode.OK.getCode() || checkMsgCode != ErrorCode.OK.getCode() || checkImageCode != ErrorCode.OK.getCode()) { - saveSystemLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [IMAGE_CODE : " + checkImageCode + "]"); - saveSystemLog("[MESSAGE DATA : " + data.toString() + "]"); + saveLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [IMAGE_CODE : " + checkImageCode + "]"); + saveLog("[MESSAGE DATA : " + data.toString() + "]"); /* 전송처리 */ worker.updateToDeliver(data.getMsgId()); /* 실패처리 */ @@ -379,21 +379,21 @@ public class CollectClientService extends Service { /* File check */ ByteBuffer file01Buffer = MmsMessage.makeImageForDeliver(path, data.getFilename01()); if (file01Buffer != null) { - saveSystemLog("file01Buffer : " + file01Buffer.capacity()); + saveLog("file01Buffer : " + file01Buffer.capacity()); } if (file01Buffer != null) { fileCount++; } ByteBuffer file02Buffer = MmsMessage.makeImageForDeliver(path, data.getFilename02()); if (file02Buffer != null) { - saveSystemLog("file02Buffer : " + file02Buffer.capacity()); + saveLog("file02Buffer : " + file02Buffer.capacity()); } if (file02Buffer != null) { fileCount++; } ByteBuffer file03Buffer = MmsMessage.makeImageForDeliver(path, data.getFilename03()); if (file03Buffer != null) { - saveSystemLog("file03Buffer : " + file03Buffer.capacity()); + saveLog("file03Buffer : " + file03Buffer.capacity()); } if (file03Buffer != null) { fileCount++; @@ -403,8 +403,8 @@ public class CollectClientService extends Service { Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, MmsMessage.DELIVER_MMS_BODY_LENGTH); MmsMessage.makeDataForDeliver(sendBuffer, data); - saveSystemLog("[MESSAGE SEND] [... ...]"); - saveSystemLog("[MESSAGE DATA : " + data.toString() + "]"); + saveLog("[MESSAGE SEND] [... ...]"); + saveLog("[MESSAGE DATA : " + data.toString() + "]"); ByteBuffer[] byteBuffers = new ByteBuffer[fileCount + 1]; int index = 0; @@ -427,17 +427,17 @@ public class CollectClientService extends Service { long MSG_SEND_TIME = System.currentTimeMillis(); while (true) { if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) { - saveSystemLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]"); + saveLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]"); throw new RuntimeException("messageSendTimeOut : Expired ... ... ... ... ... ... ..."); } int recvCount = socketChannel.read(recvBuffer); if (recvCount == -1) { - saveSystemLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]"); + saveLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]"); throw new RuntimeException("DELIVER ERROR"); } else if (recvCount > 0) { setDeliverMsgId(data.getMsgId()); // worker.updateToDeliver(data.getMsgId()); - saveSystemLog("[MESSAGE SEND] [SUCCESS]"); + saveLog("[MESSAGE SEND] [SUCCESS]"); lastPacketSendTime = System.currentTimeMillis(); break; } @@ -467,8 +467,8 @@ public class CollectClientService extends Service { int checkFileCode = MessageCheckUtil.validateJsonFile(path, data.getKakaoJsonFile()); if (checkCommonCode != ErrorCode.OK.getCode() || checkMsgCode != ErrorCode.OK.getCode() || checkFileCode != ErrorCode.OK.getCode()) { - saveSystemLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [JSON_FILE_CODE : " + checkFileCode + "]"); - saveSystemLog("[MESSAGE DATA : " + data.toString() + "]"); + saveLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [JSON_FILE_CODE : " + checkFileCode + "]"); + saveLog("[MESSAGE DATA : " + data.toString() + "]"); /* 전송처리 */ worker.updateToDeliver(data.getMsgId()); /* 실패처리 */ @@ -493,8 +493,8 @@ public class CollectClientService extends Service { Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, KakaoMessage.DELIVER_KAKAO_BODY_LENGTH); KakaoMessage.makeDataForDeliver(sendBuffer, data); - saveSystemLog("[MESSAGE SEND] [... ...]"); - saveSystemLog("[MESSAGE DATA : " + data.toString() + "]"); + saveLog("[MESSAGE SEND] [... ...]"); + saveLog("[MESSAGE DATA : " + data.toString() + "]"); ByteBuffer[] byteBuffers = new ByteBuffer[2]; byteBuffers[0] = sendBuffer; @@ -504,17 +504,17 @@ public class CollectClientService extends Service { long MSG_SEND_TIME = System.currentTimeMillis(); while (true) { if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) { - saveSystemLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]"); + saveLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]"); throw new RuntimeException("messageSendTimeOut : Expired ... ... ... ... ... ... ..."); } int recvCount = socketChannel.read(recvBuffer); if (recvCount == -1) { - saveSystemLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]"); + saveLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]"); throw new RuntimeException("DELIVER ERROR"); } else if (recvCount > 0) { setDeliverMsgId(data.getMsgId()); // worker.updateToDeliver(data.getMsgId()); - saveSystemLog("[MESSAGE SEND] [SUCCESS]"); + saveLog("[MESSAGE SEND] [SUCCESS]"); lastPacketSendTime = System.currentTimeMillis(); break; } @@ -543,8 +543,8 @@ public class CollectClientService extends Service { int checkMsgCode = MessageCheckUtil.validateMessageForKakao(data); int checkFileCode = MessageCheckUtil.validateJsonFile(path, data.getKakaoJsonFile()); if (checkCommonCode != ErrorCode.OK.getCode() || checkMsgCode != ErrorCode.OK.getCode() || checkFileCode != ErrorCode.OK.getCode()) { - saveSystemLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [JSON_FILE_CODE : " + checkFileCode + "]"); - saveSystemLog("[MESSAGE DATA : " + data.toString() + "]"); + saveLog("[MESSAGE FILTER] [COMMON_CODE : " + checkCommonCode + "] [MSG_CODE : " + checkMsgCode + "] [JSON_FILE_CODE : " + checkFileCode + "]"); + saveLog("[MESSAGE DATA : " + data.toString() + "]"); /* 전송처리 */ worker.updateToDeliver(data.getMsgId()); /* 실패처리 */ @@ -569,8 +569,8 @@ public class CollectClientService extends Service { Header.putHeader(sendBuffer, Header.COMMAND_DELIVER, KakaoMessage.DELIVER_KAKAO_BODY_LENGTH); KakaoMessage.makeDataForDeliver(sendBuffer, data); - saveSystemLog("[MESSAGE SEND] [... ...]"); - saveSystemLog("[MESSAGE DATA : " + data.toString() + "]"); + saveLog("[MESSAGE SEND] [... ...]"); + saveLog("[MESSAGE DATA : " + data.toString() + "]"); ByteBuffer[] byteBuffers = new ByteBuffer[2]; byteBuffers[0] = sendBuffer; @@ -580,17 +580,17 @@ public class CollectClientService extends Service { long MSG_SEND_TIME = System.currentTimeMillis(); while (true) { if (System.currentTimeMillis() - MSG_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) { - saveSystemLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]"); + saveLog("[messageSendTimeOut : Expired ... ... ... ... ... ... ...]"); throw new RuntimeException("messageSendTimeOut : Expired ... ... ... ... ... ... ..."); } int recvCount = socketChannel.read(recvBuffer); if (recvCount == -1) { - saveSystemLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]"); + saveLog("[MESSAGE SEND] [FAIL] [SOCKET IS CLOSED]"); throw new RuntimeException("DELIVER ERROR"); } else if (recvCount > 0) { setDeliverMsgId(data.getMsgId()); // worker.updateToDeliver(data.getMsgId()); - saveSystemLog("[MESSAGE SEND] [SUCCESS]"); + saveLog("[MESSAGE SEND] [SUCCESS]"); lastPacketSendTime = System.currentTimeMillis(); break; } @@ -611,20 +611,20 @@ public class CollectClientService extends Service { ByteBuffer recvBuffer = ByteBuffer.allocate(Header.HEADER_LENGTH + LinkCheck.LINK_CHECK_ACK_BODY_LENGTH); try { - saveSystemLog("[LINK_CHECK SEND] [... ...]"); + saveLog("[LINK_CHECK SEND] [... ...]"); socketChannel.write(LinkCheck.makeLinkCheckBuffer()); long LINK_SEND_TIME = System.currentTimeMillis(); while (true) { if (System.currentTimeMillis() - LINK_SEND_TIME >= Packet.LIMIT_PACKET_SEND_TIMEOUT) { - saveSystemLog("[LinkcheckTimeOut : Expired ... ... ... ... ... ... ...]"); + saveLog("[LinkcheckTimeOut : Expired ... ... ... ... ... ... ...]"); throw new RuntimeException("LinkcheckTimeOut : Expired ... ... ... ... ... ... ..."); } int recvCount = socketChannel.read(recvBuffer); if (recvCount == -1) { - saveSystemLog("[LINK_CHECK SEND] [FAIL] [SOCKET IS CLOSED]"); + saveLog("[LINK_CHECK SEND] [FAIL] [SOCKET IS CLOSED]"); throw new RuntimeException("LINK_CHECK ERROR"); } else if (recvCount > 0) { - saveSystemLog("[LINK_CHECK SEND] [SUCCESS]"); + saveLog("[LINK_CHECK SEND] [SUCCESS]"); lastPacketSendTime = System.currentTimeMillis(); break; } diff --git a/src/main/java/com/munjaon/client/server/service/ReportClientService.java b/src/main/java/com/munjaon/client/server/service/ReportClientService.java index 16d3ca2..bbd2d34 100644 --- a/src/main/java/com/munjaon/client/server/service/ReportClientService.java +++ b/src/main/java/com/munjaon/client/server/service/ReportClientService.java @@ -166,7 +166,7 @@ public class ReportClientService extends Service { if (command == null) { continue; } - saveSystemLog("command : " + command); + saveLog("command : " + command); switch (Integer.parseInt(command)) { case 5 : reportBodyBuffer.clear(); @@ -194,13 +194,13 @@ public class ReportClientService extends Service { private void reportService(ByteBuffer headBuffer, ByteBuffer reportBodyBuffer) { try { - saveSystemLog("Report Received"); + saveLog("Report Received"); reportBuffer.clear(); Packet.mergeBuffers(reportBuffer, headBuffer, reportBodyBuffer); MunjaonMsg data = Report.getMsgData(reportBuffer); if (data != null) { - saveSystemLog("Report : " + data.toString()); + saveLog("Report : " + data.toString()); worker.updateToReport(data); socketChannel.write(Report.makeReportAckBuffer()); lastPacketSendTime = System.currentTimeMillis(); @@ -213,7 +213,7 @@ public class ReportClientService extends Service { private void linkCheckService(ByteBuffer headBuffer, ByteBuffer linkBodyBuffer) { try { - saveSystemLog("LinkCheck Received"); + saveLog("LinkCheck Received"); socketChannel.write(LinkCheck.makeLinkCheckAckBuffer()); lastPacketSendTime = System.currentTimeMillis(); } catch (Exception e) {