From 79c20105a193a6be79849987d6cdec8eedb7b681 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Fri, 13 Nov 2015 15:16:00 +0100 Subject: [PATCH] use new logger where possible --- tasks/gulp-console.js | 4 ++-- website/src/index.js | 4 ++-- website/src/server.js | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tasks/gulp-console.js b/tasks/gulp-console.js index 84c389578b..46f4ea44ea 100644 --- a/tasks/gulp-console.js +++ b/tasks/gulp-console.js @@ -1,6 +1,6 @@ import mongoose from 'mongoose'; import autoinc from 'mongoose-id-autoinc'; -import logging from '../website/src/libs/api-v2/logging'; +import logger from '../website/src/libs/api-v3/logger'; import nconf from 'nconf'; import utils from '../website/src/libs/utils'; import repl from 'repl'; @@ -36,7 +36,7 @@ let improveRepl = (context) => { mongooseOptions, function(err) { if (err) throw err; - logging.info('Connected with Mongoose'); + logger.info('Connected with Mongoose'); } ) ); diff --git a/website/src/index.js b/website/src/index.js index aa72ec1a27..2097a7b834 100644 --- a/website/src/index.js +++ b/website/src/index.js @@ -4,7 +4,7 @@ require('babel/register'); // Only do the minimal amount of work before forking just in case of a dyno restart var cluster = require('cluster'); var nconf = require('nconf'); -var logging = require('./libs/api-v2/logging'); +var logger = require('./libs/api-v2/logger'); // Initialize configuration var setupNconf = require('./libs/api-v3/setupNconf'); @@ -26,7 +26,7 @@ if (cores !== 0 && cluster.isMaster && (IS_DEV || IS_PROD)) { cluster.on('disconnect', (worker) => { var w = cluster.fork(); // replace the dead worker - logging.info('[%s] [master:%s] worker:%s disconnect! new worker:%s fork', new Date(), process.pid, worker.process.pid, w.process.pid); + logger.info('[%s] [master:%s] worker:%s disconnect! new worker:%s fork', new Date(), process.pid, worker.process.pid, w.process.pid); }); } else { module.exports = require('./server.js'); diff --git a/website/src/server.js b/website/src/server.js index 224022b192..2562c9bb87 100644 --- a/website/src/server.js +++ b/website/src/server.js @@ -1,7 +1,7 @@ // TODO cleanup all comments when finished API v3 import nconf from 'nconf'; -import logging from './libs/api-v2/logging'; +import logger from './libs/api-v3/logger'; import utils from './libs/utils'; import express from 'express'; import http from 'http'; @@ -37,7 +37,7 @@ let mongooseOptions = !IS_PROD ? {} : { }; let db = mongoose.connect(nconf.get('NODE_DB_URI'), mongooseOptions, (err) => { if (err) throw err; - logging.info('Connected with Mongoose'); + logger.info('Connected with Mongoose'); }); autoinc.init(db); @@ -158,7 +158,7 @@ oldApp.use(require('./middlewares/errorHandler')); server.on('request', app); server.listen(app.get('port'), () => { - return logging.info(`Express server listening on port ${app.get('port')}`); + return logger.info(`Express server listening on port ${app.get('port')}`); }); export default server;