From 80e43dc07e7f3d77b049b14e4824a03e3faf9d86 Mon Sep 17 00:00:00 2001 From: Sumate Kongpui Date: Tue, 4 Sep 2018 09:29:29 +0700 Subject: [PATCH] update soap connect --- ais-structure/src/modules/helper/connection.js | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/ais-structure/src/modules/helper/connection.js b/ais-structure/src/modules/helper/connection.js index 5b8147b..b2f06fe 100644 --- a/ais-structure/src/modules/helper/connection.js +++ b/ais-structure/src/modules/helper/connection.js @@ -41,9 +41,53 @@ connection.requestSoapToSACF = async function (req,soap,cmd,myMethod) { stats.sendSACFRequest(service.Name,cmd); log.logDetail.addOutput(req,service.Name,myMethod+"_"+cmd,constants.REQUEST,params,soap); }, - end : function(){ - // stats.sendSACFRequest(service.Name,cmd); - // log.logDetail.addOutput(req,service.Name,myMethod+"_"+cmd,constants.REQUEST,params,soap); + end : function(resultObj){ + + var returnData = {}; + + if(resultObj.err) + { + //connect err => retry + var response = {}; + if(resultObj.err.code == constants.RESPONSECONN.STATS.ETIMEDOUT){ + response = constants.RESPONSECONN.MESSAGE.ETIMEDOUT; + } else if(resultObj.err.code == constants.RESPONSECONN.STATS.ECONNREFUSED){ + response = constants.RESPONSECONN.MESSAGE.ECONNREFUSED; + } else if(resultObj.err.code == constants.RESPONSECONN.STATS.ESOCKETTIMEDOUT){ + response = constants.RESPONSECONN.MESSAGE.ESOCKETTIMEDOUT; + } + + stats.receiveSACFResponse(service.Name,cmd,constants.ERROR); + log.logDetail.addInput(req,service.Name,myMethod+"_"+cmd,constants.RESPONSE,resultObj,response); + log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,response.resultCode,response.resultDescription); + + returnData.retry = true; + returnData.response = response; + returnData.err = constants.RESPONSERESULT.ERROR.developerMessage; + }else + { + if(!resultObj.response) + { + //no response data => retry + var response = constants.RESPONSERESULT.ERROR; + stats.receiveSACFBadResponse(service.Name,cmd); + log.logDetail.addInput(req,service.Name,myMethod+"_"+cmd,constants.RESPONSE,resultObj,response); + log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,response.resultCode,response.resultDescription); + + returnData.retry = true; + returnData.response = response; + returnData.err = constants.RESPONSERESULT.ERROR.developerMessage; + }else + { + returnData.retry = false; + returnData.response = resultObj; + + + } + } + + return returnData; + }, // error : function(response){log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,response.resultCode,response.resultDescription);} }; @@ -119,6 +163,8 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,response.resultCode,response.resultDescription); returnData.retry = true; + returnData.response = response; + returnData.err = constants.RESPONSERESULT.ERROR.developerMessage; }else { if(!resultObj.response) @@ -130,6 +176,8 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,response.resultCode,response.resultDescription); returnData.retry = true; + returnData.response = response; + returnData.err = constants.RESPONSERESULT.ERROR.developerMessage; }else { try -- libgit2 0.21.2