Skip to content

Commit

Permalink
Fix forgotten optional info section
Browse files Browse the repository at this point in the history
Fixes #1003
  • Loading branch information
Ruben Bridgewater committed Mar 15, 2016
1 parent 093f437 commit 24e7486
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 2 deletions.
10 changes: 8 additions & 2 deletions lib/individualCommands.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,17 @@ RedisClient.prototype.select = RedisClient.prototype.SELECT = function select (d
};

// 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 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
var tmp = this.send_command('info', [], function (err, res) {
var tmp = this.send_command('info', [section], function (err, res) {
if (res) {
var obj = {};
var lines = res.toString().split('\r\n');
Expand Down
16 changes: 16 additions & 0 deletions test/commands/info.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,22 @@ describe("The 'info' method", function () {
}, 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) {
client.info();
client.once('error', function (err) {
Expand Down

0 comments on commit 24e7486

Please sign in to comment.