diff --git a/src/main/java/com/eactive/eai/common/logger/EAILogSender.java b/src/main/java/com/eactive/eai/common/logger/EAILogSender.java index 440e14a..9bea637 100644 --- a/src/main/java/com/eactive/eai/common/logger/EAILogSender.java +++ b/src/main/java/com/eactive/eai/common/logger/EAILogSender.java @@ -106,19 +106,20 @@ public class EAILogSender { // 실시간 모니터링 로그 EAIServiceMonitor servicemonitor = EAIServiceMonitor.getInstance(); - if(EAIMessageKeys.EAI_BLOCKED_CODE.equals(message.getRspErrCd())) { - if(logger.isWarn()) { - logger.warn(guidLogPrefix + " 거래통제 실시간 모니터링 SKIP - " + message.getEAISvcCd() - + ", "+message.getMapper().getGuid(message.getStandardMessage()) ); - } - }else if (EAIMessageKeys.EAI_INFLOW_BLOCKED_CODE.equals(message.getRspErrCd())) { - if(logger.isWarn()) { - logger.warn(guidLogPrefix + " 유량제어 실시간 모니터링 SKIP - " + message.getEAISvcCd() - + ", "+ message.getMapper().getGuid(message.getStandardMessage()) ); - } - }else { - servicemonitor.receiveLogMessage(message); - } + servicemonitor.receiveLogMessage(message); +// if(EAIMessageKeys.EAI_BLOCKED_CODE.equals(message.getRspErrCd())) { +// if(logger.isWarn()) { +// logger.warn(guidLogPrefix + " 거래통제 실시간 모니터링 SKIP - " + message.getEAISvcCd() +// + ", "+message.getMapper().getGuid(message.getStandardMessage()) ); +// } +// }else if (EAIMessageKeys.EAI_INFLOW_BLOCKED_CODE.equals(message.getRspErrCd())) { +// if(logger.isWarn()) { +// logger.warn(guidLogPrefix + " 유량제어 실시간 모니터링 SKIP - " + message.getEAISvcCd() +// + ", "+ message.getMapper().getGuid(message.getStandardMessage()) ); +// } +// }else { +// servicemonitor.receiveLogMessage(message); +// } } } diff --git a/src/main/java/com/eactive/eai/common/monitor/EAIServiceMonitor.java b/src/main/java/com/eactive/eai/common/monitor/EAIServiceMonitor.java index 01ec1f0..f8342c1 100644 --- a/src/main/java/com/eactive/eai/common/monitor/EAIServiceMonitor.java +++ b/src/main/java/com/eactive/eai/common/monitor/EAIServiceMonitor.java @@ -316,6 +316,10 @@ public class EAIServiceMonitor implements Lifecycle { if (rspErrCd.length() >= 12) { error = rspErrCd.substring(1, 2); } + + if (rspErrCd.equals("RECEAIINA001")) { + error = "S"; + } // 에러와 타임아웃을 분리 : 이동훈 if (errorCode[0].equals(error.toUpperCase()) || errorCode[1].equals(error.toUpperCase())) { diff --git a/src/main/java/com/eactive/eai/outbound/DefaultProcess.java b/src/main/java/com/eactive/eai/outbound/DefaultProcess.java index a372060..fae5bdd 100644 --- a/src/main/java/com/eactive/eai/outbound/DefaultProcess.java +++ b/src/main/java/com/eactive/eai/outbound/DefaultProcess.java @@ -702,24 +702,21 @@ public abstract class DefaultProcess extends Process { AdapterErrorMessageHandler adapterErrorMessageHandler = AdapterErrorMessageHandlerFactory.createHandler(errorResponseHandlerClass); Object responseObj = adapterErrorMessageHandler.generateNonStandardErrorResponseMessage(inboudnAdapterGroupName, inboudnAdapterName, this.callProp, this.tgtTranObject, this.resEaiMsg); + if ((com.eactive.eai.adapter.Keys.IF_STANDARD.equals(this.adptrMsgPtrnCd) + ||com.eactive.eai.adapter.Keys.IF_SUBSTANDARD.equals(this.adptrMsgPtrnCd))) { + String errorCode = mapper.getErrorCode(resStandardMessage); + String errorMsg = StringUtils.trim(mapper.getErrorMsg(resStandardMessage)); + String errorDesc = StringUtils.trim(resStandardMessage.findItemValue("MSG.MAIN_MSG.outp_msg_desc")); + this.resEaiMsg.setRspErr("RECEAIINA001", String.format("[%s] %s (%s)", errorCode, errorMsg, errorDesc)); + } else { + this.resEaiMsg.setRspErr("RECEAIINA001", "비표준 오류 응답 수신"); + } + if(responseObj != null) { resStandardMessage.setBizData(responseObj, inboundAdapterGroupVO.getMessageEncode()); - } else { - if ((com.eactive.eai.adapter.Keys.IF_STANDARD.equals(this.adptrMsgPtrnCd) - ||com.eactive.eai.adapter.Keys.IF_SUBSTANDARD.equals(this.adptrMsgPtrnCd))) { - String errorCode = mapper.getErrorCode(resStandardMessage); - String errorMsg = StringUtils.trim(mapper.getErrorMsg(resStandardMessage)); - String errorDesc = StringUtils.trim(resStandardMessage.findItemValue("MSG.MAIN_MSG.outp_msg_desc")); - this.resEaiMsg.setRspErr("RECEAIINA001", String.format("[%s] %s (%s)", errorCode, errorMsg, errorDesc)); - return; - } else { - this.resEaiMsg.setRspErr("RECEAIINA001", "비표준 오류 응답 수신"); - return; - } + this.resEaiMsg.setOrgRspErrCd(this.resEaiMsg.getRspErrCd()); + this.resEaiMsg.setRspErrCd(EAIMessageKeys.BWK_FAILMSG_CODE, false); } - this.resEaiMsg.setRspErr("RECEAIINA001", "비표준 오류 응답 수신"); - this.resEaiMsg.setOrgRspErrCd(this.resEaiMsg.getRspErrCd()); - this.resEaiMsg.setRspErrCd(EAIMessageKeys.BWK_FAILMSG_CODE, false); } }