Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-17 19:21:04 +01: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

128
src/database/mongo.js
View File

@@ -161,8 +161,11 @@ mongoModule.createIndices = function (callback) {
mongoModule.checkCompatibility = function (callback) {
var mongoPkg = require('mongodb/package.json');
mongoModule.checkCompatibilityVersion(mongoPkg.version, callback);
};
if (semver.lt(mongoPkg.version, '2.0.0')) {
mongoModule.checkCompatibilityVersion = function (version, callback) {
if (semver.lt(version, '2.0.0')) {
return callback(new Error('The `mongodb` package is out-of-date, please run `./nodebb setup` again.'));
}
@@ -173,66 +176,75 @@ mongoModule.info = function (db, callback) {
if (!db) {
return callback();
}
async.parallel({
serverStatus: function (next) {
db.command({ serverStatus: 1 }, next);
async.waterfall([
function (next) {
async.parallel({
serverStatus: function (next) {
db.command({ serverStatus: 1 }, next);
},
stats: function (next) {
db.command({ dbStats: 1 }, next);
},
listCollections: function (next) {
getCollectionStats(db, next);
},
}, next);
},
stats: function (next) {
db.command({ dbStats: 1 }, next);
},
listCollections: function (next) {
db.listCollections().toArray(function (err, items) {
if (err) {
return next(err);
}
async.map(items, function (collection, next) {
db.collection(collection.name).stats(next);
}, next);
function (results, next) {
var stats = results.stats;
var scale = 1024 * 1024 * 1024;
results.listCollections = results.listCollections.map(function (collectionInfo) {
return {
name: collectionInfo.ns,
count: collectionInfo.count,
size: collectionInfo.size,
avgObjSize: collectionInfo.avgObjSize,
storageSize: collectionInfo.storageSize,
totalIndexSize: collectionInfo.totalIndexSize,
indexSizes: collectionInfo.indexSizes,
};
});
stats.mem = results.serverStatus.mem;
stats.mem = results.serverStatus.mem;
stats.mem.resident = (stats.mem.resident / 1024).toFixed(2);
stats.mem.virtual = (stats.mem.virtual / 1024).toFixed(2);
stats.mem.mapped = (stats.mem.mapped / 1024).toFixed(2);
stats.collectionData = results.listCollections;
stats.network = results.serverStatus.network;
stats.raw = JSON.stringify(stats, null, 4);
stats.avgObjSize = stats.avgObjSize.toFixed(2);
stats.dataSize = (stats.dataSize / scale).toFixed(2);
stats.storageSize = (stats.storageSize / scale).toFixed(2);
stats.fileSize = stats.fileSize ? (stats.fileSize / scale).toFixed(2) : 0;
stats.indexSize = (stats.indexSize / scale).toFixed(2);
stats.storageEngine = results.serverStatus.storageEngine ? results.serverStatus.storageEngine.name : 'mmapv1';
stats.host = results.serverStatus.host;
stats.version = results.serverStatus.version;
stats.uptime = results.serverStatus.uptime;
stats.mongo = true;
next(null, stats);
},
}, function (err, results) {
if (err) {
return callback(err);
}
var stats = results.stats;
var scale = 1024 * 1024 * 1024;
results.listCollections = results.listCollections.map(function (collectionInfo) {
return {
name: collectionInfo.ns,
count: collectionInfo.count,
size: collectionInfo.size,
avgObjSize: collectionInfo.avgObjSize,
storageSize: collectionInfo.storageSize,
totalIndexSize: collectionInfo.totalIndexSize,
indexSizes: collectionInfo.indexSizes,
};
});
stats.mem = results.serverStatus.mem;
stats.mem = results.serverStatus.mem;
stats.mem.resident = (stats.mem.resident / 1024).toFixed(2);
stats.mem.virtual = (stats.mem.virtual / 1024).toFixed(2);
stats.mem.mapped = (stats.mem.mapped / 1024).toFixed(2);
stats.collectionData = results.listCollections;
stats.network = results.serverStatus.network;
stats.raw = JSON.stringify(stats, null, 4);
stats.avgObjSize = stats.avgObjSize.toFixed(2);
stats.dataSize = (stats.dataSize / scale).toFixed(2);
stats.storageSize = (stats.storageSize / scale).toFixed(2);
stats.fileSize = stats.fileSize ? (stats.fileSize / scale).toFixed(2) : 0;
stats.indexSize = (stats.indexSize / scale).toFixed(2);
stats.storageEngine = results.serverStatus.storageEngine ? results.serverStatus.storageEngine.name : 'mmapv1';
stats.host = results.serverStatus.host;
stats.version = results.serverStatus.version;
stats.uptime = results.serverStatus.uptime;
stats.mongo = true;
callback(null, stats);
});
], callback);
};
mongoModule.close = function () {
db.close();
function getCollectionStats(db, callback) {
async.waterfall([
function (next) {
db.listCollections().toArray(next);
},
function (items, next) {
async.map(items, function (collection, next) {
db.collection(collection.name).stats(next);
}, next);
},
], callback);
}
mongoModule.close = function (callback) {
callback = callback || function () {};
db.close(callback);
};

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 || {};