update connect

sumatek
1 parent 095c6af4
Showing 5 changed files with 40 additions and 18 deletions Show diff stats
ais-structure/src/config/express.js
ais-structure/src/modules/customer/customer.ctrl.js
ais-structure/src/modules/helper/connection.js
ais-structure/src/modules/vizcard/vizCard.ctrl.js
ais-structure/src/modules/vizcard/vizCard.route.js
@@ -18,6 +18,7 @@ var passport = require(&#39;passport&#39;);
 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
@@ -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();
 };
  
  
@@ -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
@@ -70,6 +70,7 @@ exports.vizcard = async function (req, res, next) {
         log.logDetail.write();
         log.logSummary();
         res.status(200).json(response);
+        next();
     }
 };
  
 module.exports = function (app) {
     var vizcardCtrl = app.modules.vizcard.vizCardCtrl;
     var postVizcardCtrl = app.modules.vizcard.postVizCardCtrl;
+    var log = require('../helper/log.js');
...	...	@@ -18,6 +18,7 @@ var passport = require('passport');
18	18	var memCache = require('memory-cache');
19	19	var jwtDecode = require('jwt-decode');
20	20	var uuid = require('uuid');
	21	+var log = require('../modules/helper/log.js');
21	22
22	23	var expireTimeDef = 30 * 60 * 1000; //minutes * seconds * 1000 ==> ms
23	24	memCache.put('expires-ms-def', expireTimeDef);
...	...	@@ -266,6 +267,13 @@ module.exports = function () {
266	267	// // Future Action.
267	268	// });
268	269	/* ------------- [END NOT MATCH ROUTE - 404 ] ------------ */
	270	+
	271	+ app.use( function( req, res, next ) {
	272	+ // console.log("end");
	273	+ // console.log(req.res.resBody);
	274	+ log.logSummary(req.res.resBody);
	275	+} );
	276	+
269	277	return app;
270	278	};
271	279	/* ------------- [END IMPLEMENT] ------------ */
272	280	\ No newline at end of file
...	...
...	...	@@ -42,9 +42,10 @@ exports.customer = async function (req, res, next) {
42	42	var response = responseMsg.error(req,getCmd,50000);
43	43
44	44	log.logDetail.addOutput("Client",getCmd,"Response",response,response);
45		- log.logDetail.write();
46		- // log.logSummary();
	45	+ // log.logDetail.write();
	46	+ log.logSummary();
47	47	res.status(200).json(response);
	48	+ next();
48	49	};
49	50
50	51
...	...
...	...	@@ -10,9 +10,10 @@ var connection = [];
10	10	connection.requestSoapToSACF = async function (soap,cmd,myMethod) {
11	11
12	12	var params = {
13		- url : cfg.service.SACF[myMethod+"_"+cmd+"_URL"],
14		- body : messageSOAP.objectToSOAP(soap,cmd),
15		- method : myMethod
	13	+ url : cfg.service.SACF[myMethod+"_"+cmd+"_URL"],
	14	+ body : messageSOAP.objectToSOAP(soap,cmd),
	15	+ method : myMethod,
	16	+ timeout : cfg.service.SACF[myMethod+"_"+cmd+"_Timeout"]
16	17	}
17	18
18	19	return asyncRequest(params,cmd,cfg.service.SACF.Name);
...	...	@@ -22,9 +23,10 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
22	23	var service = cfg.service.D01;
23	24	// JSON.stringify(json)
24	25	var params = {
25		- url : service[myMethod+"_"+cmd+"_URL"],
26		- body : obj,
27		- method : myMethod
	26	+ url : service[myMethod+"_"+cmd+"_URL"],
	27	+ body : obj,
	28	+ method : myMethod,
	29	+ timeout : service[myMethod+"_"+cmd+"_Timeout"]
28	30	}
29	31
30	32	var result = {};
...	...	@@ -110,17 +112,25 @@ connection.requestJsonToD01 = async function (obj,cmd,myMethod) {
110	112
111	113	}
112	114
113		- if(!result.response.resultCode)
114		- result.err = "Miss resultCode";
115		-
116		- if(!result.response.resultDescription)
117		- result.err = "Miss resultDescription";
	115	+ // console.log(result);
	116	+
	117	+ if(result.response)
	118	+ {
	119	+ if(!result.response.resultCode)
	120	+ result.err = "Miss resultCode";
118	121
119		- // console.log(result);
120		- // delete result.body;
	122	+ if(!result.response.resultDescription)
	123	+ result.err = "Miss resultDescription";
	124	+ }
121	125
122	126	if(result.err)
123		- stats.reciveResponse(service.Name,cmd,"Error");
	127	+ {
	128	+ result.response = {};
	129	+ result.response.resultCode = "50000";
	130	+
	131	+ // stats.reciveResponse(service.Name,cmd,"Error");
	132	+ }
	133	+
124	134
125	135	return result;
126	136
...	...	@@ -154,11 +164,12 @@ function asyncRequest (params = {},cmd,node) {
154	164	return new Promise((resolve, reject) => {
155	165	request(params, function (error, response, body) {
156	166
157		- stats.sendRequest(node,cmd);
	167	+
158	168
159	169	if (error) {
160	170
161		- stats.reciveResponse(node,cmd,"Error");
	171	+ // console.log("End : "+new Date().toISOString());
	172	+ console.log(error.code);
162	173	resolve({
163	174	'body' : body,
164	175	'err' : error
...	...
...	...	@@ -70,6 +70,7 @@ exports.vizcard = async function (req, res, next) {
70	70	log.logDetail.write();
71	71	log.logSummary();
72	72	res.status(200).json(response);
	73	+ next();
73	74	}
74	75	};
75	76
...	...
1	1	module.exports = function (app) {
2	2	var vizcardCtrl = app.modules.vizcard.vizCardCtrl;
3	3	var postVizcardCtrl = app.modules.vizcard.postVizCardCtrl;
	4	+ var log = require('../helper/log.js');
4	5
5	6
6	7
...	...