Commit 80e43dc07e7f3d77b049b14e4824a03e3faf9d86
1 parent
12bd6d2e
Exists in
master
and in
1 other branch
update soap connect
Showing
1 changed file
with
51 additions
and
3 deletions
Show diff stats
ais-structure/src/modules/helper/connection.js
... | ... | @@ -41,9 +41,53 @@ connection.requestSoapToSACF = async function (req,soap,cmd,myMethod) { |
41 | 41 | stats.sendSACFRequest(service.Name,cmd); |
42 | 42 | log.logDetail.addOutput(req,service.Name,myMethod+"_"+cmd,constants.REQUEST,params,soap); |
43 | 43 | }, |
44 | - end : function(){ | |
45 | - // stats.sendSACFRequest(service.Name,cmd); | |
46 | - // log.logDetail.addOutput(req,service.Name,myMethod+"_"+cmd,constants.REQUEST,params,soap); | |
44 | + end : function(resultObj){ | |
45 | + | |
46 | + var returnData = {}; | |
47 | + | |
48 | + if(resultObj.err) | |
49 | + { | |
50 | + //connect err => retry | |
51 | + var response = {}; | |
52 | + if(resultObj.err.code == constants.RESPONSECONN.STATS.ETIMEDOUT){ | |
53 | + response = constants.RESPONSECONN.MESSAGE.ETIMEDOUT; | |
54 | + } else if(resultObj.err.code == constants.RESPONSECONN.STATS.ECONNREFUSED){ | |
55 | + response = constants.RESPONSECONN.MESSAGE.ECONNREFUSED; | |
56 | + } else if(resultObj.err.code == constants.RESPONSECONN.STATS.ESOCKETTIMEDOUT){ | |
57 | + response = constants.RESPONSECONN.MESSAGE.ESOCKETTIMEDOUT; | |
58 | + } | |
59 | + | |
60 | + stats.receiveSACFResponse(service.Name,cmd,constants.ERROR); | |
61 | + log.logDetail.addInput(req,service.Name,myMethod+"_"+cmd,constants.RESPONSE,resultObj,response); | |
62 | + log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,response.resultCode,response.resultDescription); | |
63 | + | |
64 | + returnData.retry = true; | |
65 | + returnData.response = response; | |
66 | + returnData.err = constants.RESPONSERESULT.ERROR.developerMessage; | |
67 | + }else | |
68 | + { | |
69 | + if(!resultObj.response) | |
70 | + { | |
71 | + //no response data => retry | |
72 | + var response = constants.RESPONSERESULT.ERROR; | |
73 | + stats.receiveSACFBadResponse(service.Name,cmd); | |
74 | + log.logDetail.addInput(req,service.Name,myMethod+"_"+cmd,constants.RESPONSE,resultObj,response); | |
75 | + log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,response.resultCode,response.resultDescription); | |
76 | + | |
77 | + returnData.retry = true; | |
78 | + returnData.response = response; | |
79 | + returnData.err = constants.RESPONSERESULT.ERROR.developerMessage; | |
80 | + }else | |
81 | + { | |
82 | + returnData.retry = false; | |
83 | + returnData.response = resultObj; | |
84 | + | |
85 | + | |
86 | + } | |
87 | + } | |
88 | + | |
89 | + return returnData; | |
90 | + | |
47 | 91 | }, |
48 | 92 | // error : function(response){log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,response.resultCode,response.resultDescription);} |
49 | 93 | }; |
... | ... | @@ -119,6 +163,8 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { |
119 | 163 | log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,response.resultCode,response.resultDescription); |
120 | 164 | |
121 | 165 | returnData.retry = true; |
166 | + returnData.response = response; | |
167 | + returnData.err = constants.RESPONSERESULT.ERROR.developerMessage; | |
122 | 168 | }else |
123 | 169 | { |
124 | 170 | if(!resultObj.response) |
... | ... | @@ -130,6 +176,8 @@ connection.requestJsonToD01 = async function (req,obj,cmd,myMethod,filter) { |
130 | 176 | log.addErrorSummary(req,service.Name,myMethod+"_"+cmd,response.resultCode,response.resultDescription); |
131 | 177 | |
132 | 178 | returnData.retry = true; |
179 | + returnData.response = response; | |
180 | + returnData.err = constants.RESPONSERESULT.ERROR.developerMessage; | |
133 | 181 | }else |
134 | 182 | { |
135 | 183 | try | ... | ... |