diff --git a/src/controllers/challenges.js b/src/controllers/challenges.js
index bb1eff241d..4dd06e87ac 100644
--- a/src/controllers/challenges.js
+++ b/src/controllers/challenges.js
@@ -7,6 +7,7 @@ var shared = require('habitrpg-shared');
var User = require('./../models/user').model;
var Group = require('./../models/group').model;
var Challenge = require('./../models/challenge').model;
+var logging = require('./../logging');
var csv = require('express-csv');
var api = module.exports;
@@ -213,7 +214,7 @@ api.update = function(req, res){
// Compare whether any changes have been made to tasks. If so, we'll want to sync those changes to subscribers
if (before.isOutdated(req.body)) {
User.find({_id: {$in: saved.members}}, function(err, users){
- console.log('Challenge updated, sync to subscribers');
+ logging.info('Challenge updated, sync to subscribers');
if (err) throw err;
_.each(users, function(user){
saved.syncToUser(user);
diff --git a/src/controllers/user.js b/src/controllers/user.js
index f0f1f72cbe..a44f5937da 100644
--- a/src/controllers/user.js
+++ b/src/controllers/user.js
@@ -12,6 +12,7 @@ var sanitize = validator.sanitize;
var User = require('./../models/user').model;
var Group = require('./../models/group').model;
var Challenge = require('./../models/challenge').model;
+var logging = require('./../logging');
var acceptablePUTPaths;
var api = module.exports;
@@ -349,7 +350,7 @@ api.buyGemsPaypalIPN = function(req, res, next) {
user.balance += 5;
//user.purchased.ads = true;
user.save();
- console.log('PayPal transaction completed and user updated');
+ logging.info('PayPal transaction completed and user updated');
});
}
});
@@ -518,4 +519,4 @@ api.batchUpdate = function(req, res, next) {
res.json(200, {_v: response._v});
}
});
-};
\ No newline at end of file
+};
diff --git a/src/middleware.js b/src/middleware.js
index 19ada70aaf..781b6f7202 100644
--- a/src/middleware.js
+++ b/src/middleware.js
@@ -4,6 +4,7 @@ var fs = require('fs');
var path = require('path');
var User = require('./models/user').model
var limiter = require('connect-ratelimit');
+var logging = require('./logging');
module.exports.apiThrottle = function(app) {
app.use(limiter({
@@ -16,7 +17,7 @@ module.exports.apiThrottle = function(app) {
}
}
})).use(function(req,res,next){
- //console.log(res.ratelimit);
+ //logging.info(res.ratelimit);
if (res.ratelimit.exceeded) return res.json(429,{err:'Rate limit exceeded'});
next();
});
@@ -92,15 +93,15 @@ var getManifestFiles = function(page){
var css = '';
_.each(files.css, function(file){
- css += '';
+ css += '';
});
if(nconf.get('NODE_ENV') === 'production'){
- return css + '';
+ return css + '';
}else{
var results = css;
_.each(files.js, function(file){
- results += '';
+ results += '';
});
return results;
}
@@ -184,16 +185,16 @@ var getUserLanguage = function(req, callback){
}
});
}else{
- return callback(null, _.find(avalaibleLanguages, {code: getFromBrowser()}));
+ return callback(null, _.find(avalaibleLanguages, {code: getFromBrowser()}));
}
}
module.exports.locals = function(req, res, next) {
getUserLanguage(req, function(err, language){
- if(err) return res.json(500, {err: err});
+ if(err) return res.json(500, {err: err});
language.momentLang = (momentLangs[language.code] || undefined);
-
+
res.locals.habitrpg = {
NODE_ENV: nconf.get('NODE_ENV'),
BASE_URL: nconf.get('BASE_URL'),
@@ -209,11 +210,11 @@ module.exports.locals = function(req, res, next) {
var string = translations[language.code][stringName];
if(!string) return _.template(translations[language.code].stringNotFound, {string: stringName});
- return vars === undefined ? string : _.template(string, vars);
+ return vars === undefined ? string : _.template(string, vars);
},
siteVersion: siteVersion
}
- next();
+ next();
});
-}
\ No newline at end of file
+}
diff --git a/src/routes/apiv1.js b/src/routes/apiv1.js
index 53207631d2..ce09e8a24a 100644
--- a/src/routes/apiv1.js
+++ b/src/routes/apiv1.js
@@ -6,6 +6,7 @@ var icalendar = require('icalendar');
var api = require('./../controllers/user');
var auth = require('./../controllers/auth');
var middleware = require('../middleware');
+var logging = require('./../logging');
/* ---------- Deprecated API ------------*/
@@ -78,7 +79,7 @@ var batchUpdate = function(req, res, next) {
req.body = action.data;
res.send = res.json = function(code, data) {
if (_.isNumber(code) && code >= 400) {
- console.error({
+ logging.error({
code: code,
data: data
});
@@ -168,4 +169,4 @@ router.get('*', deprecated);
router.post('*', deprecated);
router.put('*', deprecated);
-module.exports = router;
\ No newline at end of file
+module.exports = router;
diff --git a/src/seed.js b/src/seed.js
index becd3cf94b..111dfee1df 100644
--- a/src/seed.js
+++ b/src/seed.js
@@ -1,6 +1,7 @@
require('coffee-script') // for habitrpg-shared
var nconf = require('nconf');
var utils = require('./utils');
+var logging = require('./logging');
utils.setupConfig();
var async = require('async');
var mongoose = require('mongoose');
@@ -15,7 +16,7 @@ async.waterfall([
Group.findById('habitrpg', cb);
},
function(tavern, cb){
- console.log({tavern:tavern,cb:cb});
+ logging.info({tavern:tavern,cb:cb});
if (!tavern) {
tavern = new Group({
_id: 'habitrpg',
@@ -31,6 +32,6 @@ async.waterfall([
}
],function(err){
if (err) throw err;
- console.log("Done initializing database");
+ logging.info("Done initializing database");
mongoose.disconnect();
})
diff --git a/src/server.js b/src/server.js
index 8d95852ad0..d428beae8f 100644
--- a/src/server.js
+++ b/src/server.js
@@ -3,6 +3,7 @@ var cluster = require("cluster");
var _ = require('lodash');
var nconf = require('nconf');
var utils = require('./utils');
+var logging = require('./logging');
utils.setupConfig();
var isProd = nconf.get('NODE_ENV') === 'production';
@@ -16,7 +17,7 @@ if (cluster.isMaster && (isDev || isProd)) {
cluster.on('exit', function(worker, code, signal) {
var w = cluster.fork(); // replace the dead worker
- console.error('[%s] [master:%s] worker:%s disconnect! new worker:%s fork', new Date(), process.pid, worker.process.pid, w.process.pid);
+ logging.error('[%s] [master:%s] worker:%s disconnect! new worker:%s fork', new Date(), process.pid, worker.process.pid, w.process.pid);
});
} else {
@@ -40,7 +41,7 @@ if (cluster.isMaster && (isDev || isProd)) {
require('./models/challenge');
mongoose.connect(nconf.get('NODE_DB_URI'), {auto_reconnect:true}, function(err) {
if (err) throw err;
- console.info('Connected with Mongoose');
+ logging.info('Connected with Mongoose');
});
@@ -141,8 +142,8 @@ if (cluster.isMaster && (isDev || isProd)) {
server.on('request', app);
server.listen(app.get("port"), function() {
- return console.log("Express server listening on port " + app.get("port"));
+ return logging.info("Express server listening on port " + app.get("port"));
});
module.exports = server;
-}
\ No newline at end of file
+}
diff --git a/src/utils.js b/src/utils.js
index eacb9e7c59..f4020694d6 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -2,6 +2,7 @@ var nodemailer = require('nodemailer');
var nconf = require('nconf');
var crypto = require('crypto');
var path = require("path");
+var logging = require('./logging');
module.exports.sendEmail = function(mailData) {
var smtpTransport = nodemailer.createTransport("SMTP",{
@@ -12,8 +13,8 @@ module.exports.sendEmail = function(mailData) {
}
});
smtpTransport.sendMail(mailData, function(error, response){
- if(error) console.log(error);
- else console.log("Message sent: " + response.message);
+ if(error) logging.error(error);
+ else logging.info("Message sent: " + response.message);
smtpTransport.close(); // shut down the connection pool, no more messages
});
}
@@ -48,7 +49,7 @@ module.exports.setupConfig = function(){
// // * https://developers.google.com/chrome-developer-tools/docs/heap-profiling
// // * https://developers.google.com/chrome-developer-tools/docs/memory-analysis-101
// agent = require('webkit-devtools-agent');
-// console.log("To debug memory leaks:" +
+// logging.info("To debug memory leaks:" +
// "\n\t(1) Run `kill -SIGUSR2 " + process.pid + "`" +
// "\n\t(2) open http://c4milo.github.com/node-webkit-agent/21.0.1180.57/inspector.html?host=localhost:1337&page=0");
// }
@@ -75,9 +76,9 @@ module.exports.errorHandler = function(err, req, res, next) {
subject: "HabitRPG Error",
text: stack
});
- console.error(stack);
+ logging.error(stack);
var message = err.message ? err.message : err;
message = (message.length < 200) ? message : message.substring(0,100) + message.substring(message.length-100,message.length);
res.json(500,{err:message}); //res.end(err.message);
process.exit(0);
-}
\ No newline at end of file
+}