adding logger

Signed-off-by: SamYuan1990 <yy19902439@126.com>

.gitignore

@@ -7,4 +7,5 @@ coverage
 .nyc_output
 .vscode
 nohup.out
-log.txt
+log.txt
+logger.log

app.js

@@ -1,23 +1,28 @@
-var createError = require('http-errors');
-var express = require('express');
-var path = require('path');
-var cookieParser = require('cookie-parser');
-var logger = require('morgan');
-var ejs = require('ejs');
-
-var indexRouter = require('./routes/index');
-var apiRouter = require('./routes/api');
-
-var app = express();
-
+const createError = require('http-errors');
+const express = require('express');
+const path = require('path');
+const cookieParser = require('cookie-parser');
+const logger = require('morgan');
+const ejs = require('ejs');
+
+const indexRouter = require('./routes/index');
+const apiRouter = require('./routes/api');
+
+const app = express();
+const log4js = require('log4js');
+
+log4js.configure({
+    appenders: {app: {type: 'file', filename: 'logger.log'}},
+    categories: {default: {appenders: ['app'], level: 'error'}}
+});
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
 app.engine('html', ejs.__express);
 app.set('view engine', 'html');
 
 app.use(logger('dev'));
 app.use(express.json());
-app.use(express.urlencoded({ extended: false }));
+app.use(express.urlencoded({extended: false}));
 app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 
@@ -26,18 +31,18 @@ app.use('/api', apiRouter);
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
-  next(createError(404));
+    next(createError(404));
 });
 
 // error handler
 app.use(function(err, req, res, next) {
-  // set locals, only providing error in development
-  res.locals.message = err.message;
-  res.locals.error = req.app.get('env') === 'development' ? err : {};
+    // set locals, only providing error in development
+    res.locals.message = err.message;
+    res.locals.error = req.app.get('env') === 'development' ? err : {};
 
-  // render the error page
-  res.status(err.status || 500);
-  res.render('error');
+    // render the error page
+    res.status(err.status || 500);
+    res.render('error');
 });
 
 module.exports = app;

lib/fileIO.js

@@ -1,5 +1,7 @@
 const parse = require('csv-parse/lib/sync');
 const fs = require('fs');
+const log4js = require('log4js');
+const logger = log4js.getLogger('app');
 
 exports.BatchTimeout = 'BatchTimeout';
 exports.MaxMessageCount = 'MaxMessageCount';
@@ -41,7 +43,7 @@ exports.init = function init() {
         fs.appendFileSync('./data/rs.csv', 'Chaincode,BatchTimeout,MaxMessageCount,AbsoluteMaxBytes,PreferredMaxBytes,TPS,');
     } catch (err) {
         /* 处理错误 */
-        console.log(err);
+        logger.error(err);
     }
 };
 

lib/libs.js

@@ -1,6 +1,8 @@
 const process = require('child_process');
 const libcommands = require('./commands');
 const fileIO = require('./fileIO');
+const log4js = require('log4js');
+const logger = log4js.getLogger('app');
 
 function prepareCommands(CmdInfo, TurnInfo) {
     const tapeCommand = libcommands.PrepareTape(CmdInfo, TurnInfo);
@@ -46,7 +48,7 @@ exports.Run = function Run(CmdInfo, BatchTimeout, MaxMessageCount, AbsoluteMaxBy
                         } else {
                             const TPS = this.executeCommand(command);
                             if (TPS < 0) {
-                                console.log('error in testing');
+                                logger.error('error in tps testing');
                                 return TPS;
                             } else {
                                 fileIO.appendRS(TurnInfo.Chaincode + ',' +
@@ -67,17 +69,17 @@ exports.Run = function Run(CmdInfo, BatchTimeout, MaxMessageCount, AbsoluteMaxBy
 
 exports.handleStatus = function handleStatus(rs) {
     if (rs.status !== 0) {
-        console.error(rs);
-        console.error(rs.stderr.toString('utf-8'));
+        logger.error(rs);
+        logger.error(rs.stderr.toString('utf-8'));
         return -1;
     }
     return 0;
 };
 
 exports.executeCommand = function executeCommand(command) {
-    console.log(command.info);
+    logger.log(command.info);
     if (command.DryRun) {
-        console.log(command);
+        logger.log(command);
         return 0;
     }
     const rs = process.spawnSync(command.command, command.args, command.config);

package.json

@@ -31,6 +31,7 @@
     "ejs": "^3.1.5",
     "express": "~4.16.1",
     "http-errors": "~1.6.3",
+    "log4js": "^6.3.0",
     "morgan": "~1.9.1",
     "pug": "^3.0.0",
     "system-sleep": "^1.3.7"

routes/api.js

@@ -2,6 +2,8 @@ const express = require('express');
 const router = express.Router();
 const libs = require('../lib/libs');
 const fileIO = require('../lib/fileIO');
+const log4js = require('log4js');
+const logger = log4js.getLogger('app');
 
 /* GET users listing. */
 router.get('/', function(req, res, next) {
@@ -40,7 +42,7 @@ function prepareArray(input) {
 router.get('/run', function(req, res, next) {
     let status = 0;
     fileIO.init();
-    console.log(req.query);
+    logger.log(req.query);
     const CmdInfo = {
         Chaincode:'sample',
         Path: req.query.Path,
@@ -60,13 +62,13 @@ router.get('/run', function(req, res, next) {
     const AbsoluteMaxBytes = prepareArray(req.query.AbsoluteMaxBytes);
     const PreferredMaxBytes = prepareArray(req.query.PreferredMaxBytes);
     const d = new Date();
-    console.log('process start');
+    logger.log('process start');
     status = libs.Run(CmdInfo, BatchTimeout, MaxMessageCount, AbsoluteMaxBytes, PreferredMaxBytes);
     if (status === 0) {
-        console.log(new Date().toString());
+        logger.log(new Date().toString());
         res.send(d.toString() + ' success at ' + new Date().toString());
     } else {
-        console.log('error');
+        logger.error('error');
         res.sendStatus(500);
     }
 });