Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-18 03:31:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
Julian Lam
2017-11-02 14:13:48 -04:00
parent 6c6d177a31 dfad76120d
commit 7e0d0e0eb5
58 changed files with 686 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/database/mongo.js
View File

@@ -104,7 +104,7 @@ mongoModule.init = function (callback) {
mongoClient.connect(connString, connOptions, function (err, _db) {
if (err) {
winston.error('NodeBB could not connect to your Mongo database. Mongo returned the following error: ' + err.message);
winston.error('NodeBB could not connect to your Mongo database. Mongo returned the following error', err);
return callback(err);
}
@@ -164,7 +164,7 @@ mongoModule.createIndices = function (callback) {
async.apply(createIndex, 'objects', { expireAt: 1 }, { expireAfterSeconds: 0, background: true }),
], function (err) {
if (err) {
winston.error('Error creating index ' + err.message);
winston.error('Error creating index', err);
return callback(err);
}
winston.info('[database] Checking database indices done!');

4
src/database/redis.js
View File

@@ -99,8 +99,8 @@ redisModule.connect = function (options) {
if (dbIdx >= 0) {
cxn.select(dbIdx, function (err) {
if (err) {
winston.error('NodeBB could not connect to your Redis database. Redis returned the following error: ' + err.message);
process.exit();
winston.error('NodeBB could not connect to your Redis database. Redis returned the following error', err);
throw err;
}
});
}