Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-06 11:45:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

more tests

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2017-05-19 20:24:54 -04:00
parent 77894915eb
commit fd0043f36a
5 changed files with 201 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/database/redis.js
View File

@@ -1,6 +1,7 @@
'use strict';
var _ = require('underscore');
var async = require('async');
var winston = require('winston');
var nconf = require('nconf');
var semver = require('semver');
@@ -71,10 +72,6 @@ redisModule.connect = function (options) {
var redis_socket_or_host = nconf.get('redis:host');
var cxn;
if (!redis) {
redis = require('redis');
}
options = options || {};
if (nconf.get('redis:password')) {
@@ -101,10 +98,10 @@ redisModule.connect = function (options) {
}
var dbIdx = parseInt(nconf.get('redis:database'), 10);
if (dbIdx) {
cxn.select(dbIdx, function (error) {
if (error) {
winston.error('NodeBB could not connect to your Redis database. Redis returned the following error: ' + error.message);
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();
}
});
@@ -118,46 +115,52 @@ redisModule.createIndices = function (callback) {
};
redisModule.checkCompatibility = function (callback) {
redisModule.info(redisModule.client, function (err, info) {
if (err) {
return callback(err);
}
if (semver.lt(info.redis_version, '2.8.9')) {
return callback(new Error('Your Redis version is not new enough to support NodeBB, please upgrade Redis to v2.8.9 or higher.'));
}
callback();
});
async.waterfall([
function (next) {
redisModule.info(redisModule.client, next);
},
function (info, next) {
redisModule.checkCompatibilityVersion(info.redis_version, next);
},
], callback);
};
redisModule.close = function () {
redisClient.quit();
redisModule.checkCompatibilityVersion = function (version, callback) {
if (semver.lt(version, '2.8.9')) {
return callback(new Error('Your Redis version is not new enough to support NodeBB, please upgrade Redis to v2.8.9 or higher.'));
}
callback();
};
redisModule.close = function (callback) {
callback = callback || function () {};
redisClient.quit(callback);
};
redisModule.info = function (cxn, callback) {
if (!cxn) {
return callback();
}
cxn.info(function (err, data) {
if (err) {
return callback(err);
}
async.waterfall([
function (next) {
cxn.info(next);
},
function (data, next) {
var lines = data.toString().split('\r\n').sort();
var redisData = {};
lines.forEach(function (line) {
var parts = line.split(':');
if (parts[1]) {
redisData[parts[0]] = parts[1];
}
});
redisData.used_memory_human = (redisData.used_memory / (1024 * 1024 * 1024)).toFixed(2);
redisData.raw = JSON.stringify(redisData, null, 4);
redisData.redis = true;
var lines = data.toString().split('\r\n').sort();
var redisData = {};
lines.forEach(function (line) {
var parts = line.split(':');
if (parts[1]) {
redisData[parts[0]] = parts[1];
}
});
redisData.used_memory_human = (redisData.used_memory / (1024 * 1024 * 1024)).toFixed(2);
redisData.raw = JSON.stringify(redisData, null, 4);
redisData.redis = true;
callback(null, redisData);
});
next(null, redisData);
},
], callback);
};
redisModule.helpers = redisModule.helpers || {};