redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00
Code Activity

Fix forgotten optional info section

Browse Source 
Fixes #1003
This commit is contained in:
Ruben Bridgewater
2016-03-15 09:59:09 +01:00
parent 093f437fac
commit 24e7486a5a
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/individualCommands.js
View File

@@ -33,11 +33,17 @@ RedisClient.prototype.select = RedisClient.prototype.SELECT = function select (d
}; };
// Store info in this.server_info after each call // Store info in this.server_info after each call
RedisClient.prototype.info = RedisClient.prototype.INFO = function info (callback) { RedisClient.prototype.info = RedisClient.prototype.INFO = function info (section, callback) {
var self = this; var self = this;
var ready = this.ready; var ready = this.ready;
if (typeof section === 'function') {
callback = section;
section = 'default';
} else if (section === undefined) {
section = 'default';
}
this.ready = ready || this.offline_queue.length === 0; // keep the execution order intakt this.ready = ready || this.offline_queue.length === 0; // keep the execution order intakt
var tmp = this.send_command('info', [], function (err, res) { var tmp = this.send_command('info', [section], function (err, res) {
if (res) { if (res) {
var obj = {}; var obj = {};
var lines = res.toString().split('\r\n'); var lines = res.toString().split('\r\n');

16
test/commands/info.spec.js
View File

@@ -37,6 +37,22 @@ describe("The 'info' method", function () {
}, 150); }, 150);
}); });
it("works with optional section provided with and without callback", function (done) {
client.set('foo', 'bar');
client.info('keyspace');
client.select(2, function () {
assert.strictEqual(Object.keys(client.server_info).length, 3, 'Key length should be three');
assert(typeof client.server_info.db2 === 'object', 'db2 keyspace should be an object');
});
client.set('foo', 'bar');
client.info('all', function (err, res) {
assert(Object.keys(client.server_info).length > 3, 'Key length should be way above three');
assert.strictEqual(typeof client.server_info.redis_version, 'string');
assert.strictEqual(typeof client.server_info.db2, 'object');
done();
});
});
it("emit error after a failure", function (done) { it("emit error after a failure", function (done) {
client.info(); client.info();
client.once('error', function (err) { client.once('error', function (err) {