Nattapon Wongpaet / SPW

Download as
Browse Code ยป

Commit 095909b9e67d07d0de42876423da972eb51c4b2d

Authored by sumatek
1 parent 23001dfb
Exists in master and in 1 other branch dev

update log

Showing 3 changed files with 95 additions and 24 deletions   Show diff stats
ais-structure/src/modules/helper/log.js
  Diff comments   View file @095909b
... ... @@ -12,8 +12,10 @@ var logg = require('commonlog-kb').init(conf);
12 12  
13 13 var logger = [];
14 14 var summaryList = [];
  15 +var start = {};
  16 +var detail = {};
15 17  
16   -logger.log(msg,type)
  18 +logger.log = function (msg,type)
17 19 {
18 20  
19 21 if(!type)
... ... @@ -39,16 +41,23 @@ logger.log(msg,type)
39 41 }
40 42 }
41 43  
42   -logger.start(sessionData,cmdData,identityData)
  44 +logger.startlog = function (cmdData,rawData)
43 45 {
44   - summary = {
45   - session : sessionData,
  46 + var data = {
  47 + body : rawData.body,
  48 + query : rawData.query,
  49 + params : rawData.params
  50 + };
  51 + start = {
  52 + session : rawData.headers,
46 53 cmd : cmdData,
47   - identity : identityData
  54 + identity : data
48 55 };
49   - summaryList.push();
  56 +
  57 + // console.log(start);
50 58 }
51   -logger.addSummary(nodeData,cmdData,resultData)
  59 +
  60 +logger.addSummary = function (nodeData,cmdData,resultData)
52 61 {
53 62 summary = {
54 63 node : nodeData,
... ... @@ -56,28 +65,74 @@ logger.addSummary(nodeData,cmdData,resultData)
56 65 resultCode : resultData.resultCode,
57 66 resultDesc : resultData.developerMessage
58 67 };
59   - summaryList.push();
  68 + summaryList.push(summary);
  69 + // console.log(summary);
60 70 }
61 71  
62   -logger.logSummary()
  72 +logger.logSummary = function ()
63 73 {
64   - var log;
  74 + var log = logg.summary(start.session, start.cmd, start.identity);
65 75 var row;
66 76 for (let index = 0; index < summaryList.length; index++) {
67   - row = array[index];
  77 + row = summaryList[index];
  78 + log.addSuccessBlock(row.node,row.cmd,row.resultCode,row.resultDesc);
  79 + }
  80 + log.end(row.resultCode,row.resultDesc)
  81 +}
68 82  
69   - if(index == 0)
  83 +var addlogDetailData = function(inputType,node,cmd,type,rawData,data){
  84 + if(inputType == 'input')
  85 + {
  86 + if(!data)
70 87 {
71   - log = logg.summary(row.session1, row.cmd, row.identity);
72   - }else
73   - {
74   - log.addSuccessBlock(row.node,row.cmd,row.resultCode,row.resultDesc);
  88 + var data = {
  89 + body : rawData.body,
  90 + query : rawData.query,
  91 + params : rawData.params
  92 + };
75 93 }
76   -
  94 +
  95 + detail.input = {
  96 + node : node,
  97 + cmd : cmd,
  98 + type : type,
  99 + rawData : data,
  100 + data : data
  101 + };
  102 +
  103 + // console.log(detail.input);
  104 + }
  105 + else if(inputType == 'output')
  106 + {
  107 + detail.output = {
  108 + node : node,
  109 + cmd : cmd,
  110 + type : type,
  111 + rawData : rawData,
  112 + data : data
  113 + };
  114 +
  115 + // console.log(detail.output);
77 116 }
78   - log.end(row.resultCode,row.resultDesc)
79 117 }
80 118  
  119 +var logDetailData = {
  120 + addInput : function(node,cmd,type,rawData,data){addlogDetailData('input',node,cmd,type,rawData,data)},
  121 + addOutput : function(node,cmd,type,rawData,data){addlogDetailData('output',node,cmd,type,rawData,data)},
  122 + write : function ()
  123 + {
  124 + var log = logg.detail(start.session, start.cmd, start.identity);
  125 + log.addInput( detail.input.node, detail.input.cmd, detail.input.type, detail.input.rawData, detail.input.data );
  126 + log.addOutput( detail.output.node, detail.output.cmd, detail.output.type, detail.output.rawData, detail.output.data );
  127 + log.end();
  128 + }
  129 +};
  130 +
  131 +logger.logDetail = logDetailData;
  132 +
  133 +
  134 +
  135 +
81 136 module.exports = logger;
82 137  
83 138  
... ... @@ -96,7 +151,7 @@ module.exports = logger;
96 151 // s2.end();
97 152  
98 153 //type// - REQ, RES, RES_TIMEOUT, REQ_RETRY_1/1
99   -var ddd = logg.detail('session1', 'cmd', 'identity');
100   -ddd.addInput( 'node', 'cmd', 'type', 'rawData', 'data' );
101   -ddd.addOutput( 'node', 'cmd', 'type', 'rawData', 'data');
102   -ddd.end();
103 154 \ No newline at end of file
  155 +// var ddd = logg.detail('session1', 'cmd', 'identity');
  156 +// ddd.addInput( 'node', 'cmd', 'type', 'rawData', 'data' );
  157 +// ddd.addOutput( 'node', 'cmd', 'type', 'rawData', 'data');
  158 +// ddd.end();
104 159 \ No newline at end of file
... ...
ais-structure/src/modules/vizcard/vizCard.ctrl.js
  Diff comments   View file @095909b
... ... @@ -5,11 +5,16 @@ var messageSOAP = require(&#39;../helper/messageSOAP.js&#39;);
5 5 var validatorHelper = require('../helper/validator.js');
6 6 var connection = require('../helper/connection.js');
7 7 var responseMsg = require('../helper/responseMsg.js');
  8 +var log = require('../helper/log.js');
8 9  
9 10 exports.vizcard = async function (req, res, next) {
10 11 var getCmd = "VIZCard";
11 12 var sendCmd = "SearchCustomer";
12   -
  13 +
  14 + log.startlog(getCmd,req);
  15 + log.logDetail.addInput("Client",getCmd,"Request",req);
  16 +
  17 + // (node,cmd,type,rawData,data)
13 18 var err = validator(req,getCmd);
14 19  
15 20 if(err.length > 0)
... ... @@ -38,7 +43,8 @@ exports.vizcard = async function (req, res, next) {
38 43  
39 44 // console.log(result.err)
40 45  
41   - if(typeof result.err === 'undefined'){
  46 + if(typeof result.err === 'undefined'){
  47 +
42 48 var resultSoap = parseJson.xml2json(result.body, {compact: true, spaces: 4})
43 49 resultSoap = JSON.parse(resultSoap)
44 50 resultSoap = resultSoap['soap:Envelope']['soap:Body']['tem:SearchCustomerResponse']['tem:SearchCustomerResult']['tem:CustomerSearchResult'];
... ... @@ -46,12 +52,18 @@ exports.vizcard = async function (req, res, next) {
46 52 var resultSet = messageSOAP.soapToArray(req,resultSoap);
47 53  
48 54 var response = responseMsg.success(req,getCmd,{resultData:resultSet,rowCount:resultSet.length});
  55 +
  56 + log.addSummary("SPW",sendCmd,response);
49 57  
50 58 }
51 59  
52 60 if(!response)
53 61 var response = responseMsg.error(req,getCmd,50000);
54 62  
  63 +
  64 + log.logDetail.addOutput("Client",getCmd,"Response",response,response);
  65 + log.logDetail.write();
  66 + log.logSummary();
55 67 res.status(200).json(response);
56 68 }
57 69 };
... ...
ais-structure/src/modules/vizcard/vizCard.route.js
  Diff comments   View file @095909b
... ... @@ -2,6 +2,8 @@ module.exports = function (app) {
2 2 var vizcardCtrl = app.modules.vizcard.vizCardCtrl;
3 3 var postVizcardCtrl = app.modules.vizcard.postVizCardCtrl;
4 4  
  5 +
  6 +
5 7 app.get('/cmf/v2/vizcard.json',
6 8 vizcardCtrl.vizcard
7 9 );
... ... @@ -9,4 +11,6 @@ module.exports = function (app) {
9 11 app.post('/cmf/v2/vizCard.json',
10 12 postVizcardCtrl.postVizcard
11 13 );
  14 +
  15 +
12 16 };
... ...