From 095909b9e67d07d0de42876423da972eb51c4b2d Mon Sep 17 00:00:00 2001 From: Sumate Kongpui Date: Fri, 17 Aug 2018 13:05:33 +0700 Subject: [PATCH] update log --- ais-structure/src/modules/helper/log.js | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------- ais-structure/src/modules/vizcard/vizCard.ctrl.js | 16 ++++++++++++++-- ais-structure/src/modules/vizcard/vizCard.route.js | 4 ++++ 3 files changed, 95 insertions(+), 24 deletions(-) diff --git a/ais-structure/src/modules/helper/log.js b/ais-structure/src/modules/helper/log.js index 2255b43..5e7dc75 100644 --- a/ais-structure/src/modules/helper/log.js +++ b/ais-structure/src/modules/helper/log.js @@ -12,8 +12,10 @@ var logg = require('commonlog-kb').init(conf); var logger = []; var summaryList = []; +var start = {}; +var detail = {}; -logger.log(msg,type) +logger.log = function (msg,type) { if(!type) @@ -39,16 +41,23 @@ logger.log(msg,type) } } -logger.start(sessionData,cmdData,identityData) +logger.startlog = function (cmdData,rawData) { - summary = { - session : sessionData, + var data = { + body : rawData.body, + query : rawData.query, + params : rawData.params + }; + start = { + session : rawData.headers, cmd : cmdData, - identity : identityData + identity : data }; - summaryList.push(); + + // console.log(start); } -logger.addSummary(nodeData,cmdData,resultData) + +logger.addSummary = function (nodeData,cmdData,resultData) { summary = { node : nodeData, @@ -56,28 +65,74 @@ logger.addSummary(nodeData,cmdData,resultData) resultCode : resultData.resultCode, resultDesc : resultData.developerMessage }; - summaryList.push(); + summaryList.push(summary); + // console.log(summary); } -logger.logSummary() +logger.logSummary = function () { - var log; + var log = logg.summary(start.session, start.cmd, start.identity); var row; for (let index = 0; index < summaryList.length; index++) { - row = array[index]; + row = summaryList[index]; + log.addSuccessBlock(row.node,row.cmd,row.resultCode,row.resultDesc); + } + log.end(row.resultCode,row.resultDesc) +} - if(index == 0) +var addlogDetailData = function(inputType,node,cmd,type,rawData,data){ + if(inputType == 'input') + { + if(!data) { - log = logg.summary(row.session1, row.cmd, row.identity); - }else - { - log.addSuccessBlock(row.node,row.cmd,row.resultCode,row.resultDesc); + var data = { + body : rawData.body, + query : rawData.query, + params : rawData.params + }; } - + + detail.input = { + node : node, + cmd : cmd, + type : type, + rawData : data, + data : data + }; + + // console.log(detail.input); + } + else if(inputType == 'output') + { + detail.output = { + node : node, + cmd : cmd, + type : type, + rawData : rawData, + data : data + }; + + // console.log(detail.output); } - log.end(row.resultCode,row.resultDesc) } +var logDetailData = { + addInput : function(node,cmd,type,rawData,data){addlogDetailData('input',node,cmd,type,rawData,data)}, + addOutput : function(node,cmd,type,rawData,data){addlogDetailData('output',node,cmd,type,rawData,data)}, + write : function () + { + var log = logg.detail(start.session, start.cmd, start.identity); + log.addInput( detail.input.node, detail.input.cmd, detail.input.type, detail.input.rawData, detail.input.data ); + log.addOutput( detail.output.node, detail.output.cmd, detail.output.type, detail.output.rawData, detail.output.data ); + log.end(); + } +}; + +logger.logDetail = logDetailData; + + + + module.exports = logger; @@ -96,7 +151,7 @@ module.exports = logger; // s2.end(); //type// - REQ, RES, RES_TIMEOUT, REQ_RETRY_1/1 -var ddd = logg.detail('session1', 'cmd', 'identity'); -ddd.addInput( 'node', 'cmd', 'type', 'rawData', 'data' ); -ddd.addOutput( 'node', 'cmd', 'type', 'rawData', 'data'); -ddd.end(); \ No newline at end of file +// var ddd = logg.detail('session1', 'cmd', 'identity'); +// ddd.addInput( 'node', 'cmd', 'type', 'rawData', 'data' ); +// ddd.addOutput( 'node', 'cmd', 'type', 'rawData', 'data'); +// ddd.end(); \ No newline at end of file diff --git a/ais-structure/src/modules/vizcard/vizCard.ctrl.js b/ais-structure/src/modules/vizcard/vizCard.ctrl.js index 09798cd..6d99942 100644 --- a/ais-structure/src/modules/vizcard/vizCard.ctrl.js +++ b/ais-structure/src/modules/vizcard/vizCard.ctrl.js @@ -5,11 +5,16 @@ var messageSOAP = require('../helper/messageSOAP.js'); var validatorHelper = require('../helper/validator.js'); var connection = require('../helper/connection.js'); var responseMsg = require('../helper/responseMsg.js'); +var log = require('../helper/log.js'); exports.vizcard = async function (req, res, next) { var getCmd = "VIZCard"; var sendCmd = "SearchCustomer"; - + + log.startlog(getCmd,req); + log.logDetail.addInput("Client",getCmd,"Request",req); + + // (node,cmd,type,rawData,data) var err = validator(req,getCmd); if(err.length > 0) @@ -38,7 +43,8 @@ exports.vizcard = async function (req, res, next) { // console.log(result.err) - if(typeof result.err === 'undefined'){ + if(typeof result.err === 'undefined'){ + var resultSoap = parseJson.xml2json(result.body, {compact: true, spaces: 4}) resultSoap = JSON.parse(resultSoap) resultSoap = resultSoap['soap:Envelope']['soap:Body']['tem:SearchCustomerResponse']['tem:SearchCustomerResult']['tem:CustomerSearchResult']; @@ -46,12 +52,18 @@ exports.vizcard = async function (req, res, next) { var resultSet = messageSOAP.soapToArray(req,resultSoap); var response = responseMsg.success(req,getCmd,{resultData:resultSet,rowCount:resultSet.length}); + + log.addSummary("SPW",sendCmd,response); } if(!response) var response = responseMsg.error(req,getCmd,50000); + + log.logDetail.addOutput("Client",getCmd,"Response",response,response); + log.logDetail.write(); + log.logSummary(); res.status(200).json(response); } }; diff --git a/ais-structure/src/modules/vizcard/vizCard.route.js b/ais-structure/src/modules/vizcard/vizCard.route.js index 7a1deed..1ca5ac3 100644 --- a/ais-structure/src/modules/vizcard/vizCard.route.js +++ b/ais-structure/src/modules/vizcard/vizCard.route.js @@ -2,6 +2,8 @@ module.exports = function (app) { var vizcardCtrl = app.modules.vizcard.vizCardCtrl; var postVizcardCtrl = app.modules.vizcard.postVizCardCtrl; + + app.get('/cmf/v2/vizcard.json', vizcardCtrl.vizcard ); @@ -9,4 +11,6 @@ module.exports = function (app) { app.post('/cmf/v2/vizCard.json', postVizcardCtrl.postVizcard ); + + }; -- libgit2 0.21.2