krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'api-v3' into api-v3-i18n

Browse Source
This commit is contained in:
Blade Barringer
2015-11-13 10:49:21 -06:00
parent 810a818334 eede74758d
commit 49a6a7167b
6 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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/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;