From 78ea462620ff54ced3b14925edb96937ecaee24f Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 8 Jun 2015 15:34:39 -0400 Subject: [PATCH] fix crash when redis server isn't running --- src/database/mongo.js | 1 - src/database/redis.js | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/database/mongo.js b/src/database/mongo.js index 9ddd7bfca5..2d9ab4ee14 100644 --- a/src/database/mongo.js +++ b/src/database/mongo.js @@ -167,7 +167,6 @@ }; module.checkCompatibility = function(callback) { - // For MongoDB, we need to ensure that the mongodb package is >= 2.0.0 var mongoPkg = require.main.require('./node_modules/mongodb/package.json'), err = semver.lt(mongoPkg.version, '2.0.0') ? new Error('The `mongodb` package is out-of-date, please run `./nodebb setup` again.') : null; diff --git a/src/database/redis.js b/src/database/redis.js index 673bf1f14a..da9c49aaa6 100644 --- a/src/database/redis.js +++ b/src/database/redis.js @@ -113,12 +113,16 @@ }; module.checkCompatibility = function(callback) { - // Redis requires v2.8.9 module.info(module.client, function(err, info) { - var err = semver.lt(info.redis_version, '2.8.9') ? new Error('Your Redis version is not new enough to support NodeBB, please upgrade Redis to v2.8.9 or higher.') : null; if (err) { + return callback(err); + } + + if (semver.lt(info.redis_version, '2.8.9')) { + err = new Error('Your Redis version is not new enough to support NodeBB, please upgrade Redis to v2.8.9 or higher.'); err.stacktrace = false; } + callback(err); }); };