From 38148b24cb97eed64aff7c056613972e5526829c Mon Sep 17 00:00:00 2001 From: fengmk2 Date: Sun, 26 Jun 2016 13:28:42 +0800 Subject: [PATCH] fix: logger seperator should be one EOL (#972) --- common/logger.js | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/common/logger.js b/common/logger.js index 4d53fb4ab..abb18d82d 100644 --- a/common/logger.js +++ b/common/logger.js @@ -1,38 +1,40 @@ 'use strict'; -var debug = require('debug')('cnpmjs.org:logger'); -var formater = require('error-formater'); -var Logger = require('mini-logger'); -var utility = require('utility'); -var util = require('util'); -var config = require('../config'); -var mail = require('./mail'); +const debug = require('debug')('cnpmjs.org:logger'); +const formater = require('error-formater'); +const Logger = require('mini-logger'); +const utility = require('utility'); +const util = require('util'); +const os = require('os'); +const config = require('../config'); +const mail = require('./mail'); -var isTEST = process.env.NODE_ENV === 'test'; -var categories = ['sync_info', 'sync_error']; +const isTEST = process.env.NODE_ENV === 'test'; +const categories = ['sync_info', 'sync_error']; -var logger = module.exports = Logger({ +const logger = module.exports = Logger({ categories: categories, dir: config.logdir, duration: '1d', format: '[{category}.]YYYY-MM-DD[.log]', stdout: config.debug && !isTEST, - errorFormater: errorFormater + errorFormater: errorFormater, + seperator: os.EOL, }); -var to = []; +const to = []; for (var user in config.admins) { to.push(config.admins[user]); } function errorFormater(err) { - var msg = formater.both(err); + const msg = formater.both(err); mail.error(to, msg.json.name, msg.text); return msg.text; } logger.syncInfo = function () { - var args = [].slice.call(arguments); + const args = [].slice.call(arguments); if (typeof args[0] === 'string') { args[0] = util.format('[%s][%s] ', utility.logDate(), process.pid) + args[0]; } @@ -43,7 +45,7 @@ logger.syncInfo = function () { }; logger.syncError =function () { - var args = [].slice.call(arguments); + const args = [].slice.call(arguments); if (typeof args[0] === 'string') { args[0] = util.format('[%s][%s] ', utility.logDate(), process.pid) + args[0]; }