diff --git a/ais-structure/src/config/express.js b/ais-structure/src/config/express.js index 56a759d..3aa05e7 100644 --- a/ais-structure/src/config/express.js +++ b/ais-structure/src/config/express.js @@ -18,6 +18,7 @@ var passport = require('passport'); var memCache = require('memory-cache'); var jwtDecode = require('jwt-decode'); var uuid = require('uuid'); +var log = require('../modules/helper/log.js'); var expireTimeDef = 30 * 60 * 1000; //minutes * seconds * 1000 ==> ms memCache.put('expires-ms-def', expireTimeDef); @@ -266,6 +267,13 @@ module.exports = function () { // // Future Action. // }); /* ------------- [END NOT MATCH ROUTE - 404 ] ------------ */ + + app.use( function( req, res, next ) { + // console.log("end"); + // console.log(req.res.resBody); + log.logSummary(req.res.resBody); +} ); + return app; }; /* ------------- [END IMPLEMENT] ------------ */ \ No newline at end of file diff --git a/ais-structure/src/modules/customer/customer.ctrl.js b/ais-structure/src/modules/customer/customer.ctrl.js index 8353c09..59a8a7b 100644 --- a/ais-structure/src/modules/customer/customer.ctrl.js +++ b/ais-structure/src/modules/customer/customer.ctrl.js @@ -42,9 +42,10 @@ exports.customer = async function (req, res, next) { var response = responseMsg.error(req,getCmd,50000); log.logDetail.addOutput("Client",getCmd,"Response",response,response); - log.logDetail.write(); - // log.logSummary(); + // log.logDetail.write(); + log.logSummary(); res.status(200).json(response); + next(); }; diff --git a/ais-structure/src/modules/helper/connection.js b/ais-structure/src/modules/helper/connection.js index b5f8c97..f03a798 100644 --- a/ais-structure/src/modules/helper/connection.js +++ b/ais-structure/src/modules/helper/connection.js @@ -10,9 +10,10 @@ var connection = []; connection.requestSoapToSACF = async function (soap,cmd,myMethod) { var params = { - url : cfg.service.SACF[myMethod+"_"+cmd+"_URL"], - body : messageSOAP.objectToSOAP(soap,cmd), - method : myMethod + url : cfg.service.SACF[myMethod+"_"+cmd+"_URL"], + body : messageSOAP.objectToSOAP(soap,cmd), + method : myMethod, + timeout : cfg.service.SACF[myMethod+"_"+cmd+"_Timeout"] } return asyncRequest(params,cmd,cfg.service.SACF.Name); @@ -22,9 +23,10 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { var service = cfg.service.D01; // JSON.stringify(json) var params = { - url : service[myMethod+"_"+cmd+"_URL"], - body : obj, - method : myMethod + url : service[myMethod+"_"+cmd+"_URL"], + body : obj, + method : myMethod, + timeout : service[myMethod+"_"+cmd+"_Timeout"] } var result = {}; @@ -110,17 +112,25 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) { } - if(!result.response.resultCode) - result.err = "Miss resultCode"; - - if(!result.response.resultDescription) - result.err = "Miss resultDescription"; + // console.log(result); + + if(result.response) + { + if(!result.response.resultCode) + result.err = "Miss resultCode"; - // console.log(result); - // delete result.body; + if(!result.response.resultDescription) + result.err = "Miss resultDescription"; + } if(result.err) - stats.reciveResponse(service.Name,cmd,"Error"); + { + result.response = {}; + result.response.resultCode = "50000"; + + // stats.reciveResponse(service.Name,cmd,"Error"); + } + return result; @@ -154,11 +164,12 @@ function asyncRequest (params = {},cmd,node) { return new Promise((resolve, reject) => { request(params, function (error, response, body) { - stats.sendRequest(node,cmd); + if (error) { - stats.reciveResponse(node,cmd,"Error"); + // console.log("End : "+new Date().toISOString()); + console.log(error.code); resolve({ 'body' : body, 'err' : error diff --git a/ais-structure/src/modules/vizcard/vizCard.ctrl.js b/ais-structure/src/modules/vizcard/vizCard.ctrl.js index c058c93..2bc0070 100644 --- a/ais-structure/src/modules/vizcard/vizCard.ctrl.js +++ b/ais-structure/src/modules/vizcard/vizCard.ctrl.js @@ -70,6 +70,7 @@ exports.vizcard = async function (req, res, next) { log.logDetail.write(); log.logSummary(); res.status(200).json(response); + next(); } }; diff --git a/ais-structure/src/modules/vizcard/vizCard.route.js b/ais-structure/src/modules/vizcard/vizCard.route.js index 1ca5ac3..990bf50 100644 --- a/ais-structure/src/modules/vizcard/vizCard.route.js +++ b/ais-structure/src/modules/vizcard/vizCard.route.js @@ -1,6 +1,7 @@ module.exports = function (app) { var vizcardCtrl = app.modules.vizcard.vizCardCtrl; var postVizcardCtrl = app.modules.vizcard.postVizCardCtrl; + var log = require('../helper/log.js'); -- libgit2 0.21.2