From 57d157f62464dc5c12520c28c5bb9bdd250bc737 Mon Sep 17 00:00:00 2001 From: Sumate Kongpui Date: Thu, 18 Oct 2018 17:10:56 +0700 Subject: [PATCH] add stats post --- controllers/preference/index.js | 20 +++++++++++++++----- package.json | 3 ++- utils/log.js | 1 + utils/mongoDB.js | 15 +++++++++++++-- utils/stats.js | 1 - 5 files changed, 31 insertions(+), 9 deletions(-) diff --git a/controllers/preference/index.js b/controllers/preference/index.js index 8ba779f..820f2b5 100644 --- a/controllers/preference/index.js +++ b/controllers/preference/index.js @@ -34,13 +34,23 @@ router.get('/:collection',async function (req, res,next) { }); router.post('/:collection',async function (req, res,next) { - start(req) - var collection = req.params.collection; + var cmd = req.params.collection; - var query = req.body; - var result = await connection.reqMongo(req,req.method,query,collection) + var checkStart = start(req,cmd); + if(checkStart.err) + { + var result = checkStart.err; + end(req,"Unknow"); - end(req); + }else + { + var collection = req.params.collection; + + var query = req.body; + var result = await connection.reqMongo(req,req.method,query,collection) + + end(req,cmd); + } res.status(200).json(result); next(); }); diff --git a/package.json b/package.json index 0b1164b..28ec2e1 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "scripts": { "test": "mocha unitTest", "start": "npm run test && node app.js", - "gentest": "mocha unitTest && NODE_ENV=gentest node app.js" + "gentest": "mocha unitTest && NODE_ENV=gentest node app.js", + "pull" : "git pull && npm install && pm2 stop hospital && pm2 start node app.js --name=hospital " }, "author": "Source Code", "license": "ISC", diff --git a/utils/log.js b/utils/log.js index 133b574..0200deb 100644 --- a/utils/log.js +++ b/utils/log.js @@ -228,6 +228,7 @@ logger.detailSqlQuery = function(req,collection,data) logger.detailSqlResult = function(req,collection,data) { logger4jDetail.info(logPrefix(req)+"BE Receive Mongo Collection: \""+collection+"\" Result: "+JSON.stringify(data)); + } logger.detailRequestBE = function(req,data) diff --git a/utils/mongoDB.js b/utils/mongoDB.js index 5b837b4..39a2d09 100644 --- a/utils/mongoDB.js +++ b/utils/mongoDB.js @@ -1,4 +1,5 @@ const log = require('./log'); +const stat = require('./stats'); var constants = require('./constants'); var MongoClient = require('mongodb').MongoClient; var config = require('./config'); @@ -18,10 +19,20 @@ connection.reqMongo = async function (req,method, query, collection) { function mongoReq(req,url,database,method, query, collection){ + var nodeName = "MongoDB"; var funStats = { - detailSqlQuery : function(query){log.detailSqlQuery(req,collection,query);}, - detailSqlResult : function(result, err){log.detailSqlResult(req,collection,result || err);}, + detailSqlQuery : function(query){ + log.detailSqlQuery(req,collection,query); + stat.sendQuery(collection); + }, + detailSqlResult : function(result, err){ + log.detailSqlResult(req,collection,result || err); + if(result) + stat.receiveQuery(collection); + else + stat.receiveBadQuery(collection); + }, addSuccessSummary : function(result){log.addSuccessSummary(req,nodeName,collection,result);}, addErrorSummary : function(result){log.addErrorSummary(req,nodeName,collection,result);} }; diff --git a/utils/stats.js b/utils/stats.js index 04d2a8d..5e1c2f4 100644 --- a/utils/stats.js +++ b/utils/stats.js @@ -1,6 +1,5 @@ var config = require('./config'); var log = require('./log.js'); -var constants = require('./constants.js'); var nodeName = config.get("appName"); var stat = []; -- libgit2 0.21.2