krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move old logging lib v2 directory

Browse Source
This commit is contained in:
Blade Barringer
2015-11-12 08:07:32 -06:00
parent 3a1075a0e6
commit 858bf99930
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/gulp-console.js
View File

@@ -2,7 +2,7 @@ import 'coffee-script';
import mongoose from 'mongoose';
import autoinc from 'mongoose-id-autoinc';
import logging from '../website/src/libs/logging';
import logging from '../website/src/libs/api-v2/logging';
import nconf from 'nconf';
import utils from '../website/src/libs/utils';
import repl from 'repl';

2
website/src/controllers/api-v2/challenges.js
View File

@@ -7,7 +7,7 @@ var shared = require('../../../../common');
var User = require('./../../models/user').model;
var Group = require('./../../models/group').model;
var Challenge = require('./../../models/challenge').model;
var logging = require('./../../libs/logging');
var logging = require('./../../libs/api-v2/logging');
var csv = require('express-csv');
var utils = require('../../libs/utils');
var api = module.exports;

2
website/src/controllers/api-v2/user.js
View File

@@ -12,7 +12,7 @@ var analytics = utils.analytics;
var Group = require('./../../models/group').model;
var Challenge = require('./../../models/challenge').model;
var moment = require('moment');
var logging = require('./../../libs/logging');
var logging = require('./../../libs/api-v2/logging');
var acceptablePUTPaths;
var api = module.exports;
var firebase = require('../../libs/firebase');

2
website/src/controllers/payments/paypal.js
View File

@@ -5,7 +5,7 @@ var _ = require('lodash');
var url = require('url');
var User = require('mongoose').model('User');
var payments = require('./index');
var logger = require('../../libs/logging');
var logger = require('../../libs/api-v2/logging');
var ipn = require('paypal-ipn');
var paypal = require('paypal-rest-sdk');
var shared = require('../../../../common');

2
website/src/index.js
View File

@@ -7,7 +7,7 @@ require('coffee-script');
// 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/logging');
var logging = require('./libs/api-v2/logging');
// Initialize configuration
var setupNconf = require('./libs/api-v3/setupNconf');

0
website/src/libs/logging.js → website/src/libs/api-v2/logging.js
View File

2
website/src/libs/utils.js
View File

@@ -16,7 +16,7 @@ module.exports.sendEmail = function(mailData) {
}
});
smtpTransport.sendMail(mailData, function(error, response){
var logging = require('./logging');
var logging = require('./api-v2/logging');
if(error) logging.error(error);
else logging.info("Message sent: " + response.message);
smtpTransport.close(); // shut down the connection pool, no more messages

2
website/src/middlewares/errorHandler.js
View File

@@ -1,4 +1,4 @@
var logging = require('../libs/logging');
var logging = require('../libs/api-v2/logging');
module.exports = function(err, req, res, next) {
//res.locals.domain.emit('error', err);

2
website/src/models/group.js
View File

@@ -4,7 +4,7 @@ var User = require('./user').model;
var shared = require('../../../common');
var _ = require('lodash');
var async = require('async');
var logging = require('../libs/logging');
var logging = require('../libs/api-v2/logging');
var Challenge = require('./../models/challenge').model;
var firebase = require('../libs/firebase');

2
website/src/server.js
View File

@@ -1,7 +1,7 @@
// TODO cleanup all comments when finished API v3
import nconf from 'nconf';
import logging from './libs/logging';
import logging from './libs/api-v2/logging';
import utils from './libs/utils';
import express from 'express';
import http from 'http';