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

Merge pull request #826 from fintura/multi

Browse Source 
Fix multi error handling
This commit is contained in:
Ruben Bridgewater
2015-09-18 00:38:05 +02:00
parent 4d1390318c 21d8bdbbcb
commit c846ed71d1
4 changed files with 80 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
index.js
View File

@@ -381,7 +381,6 @@ RedisClient.prototype.ready_check = function () {
RedisClient.prototype.send_offline_queue = function () {
var command_obj, buffered_writes = 0;
// TODO: Implement queue.pop() as it should be faster than shift and evaluate petka antonovs queue
while (command_obj = this.offline_queue.shift()) {
debug("Sending offline command: " + command_obj.command);
buffered_writes += !this.send_command(command_obj.command, command_obj.args, command_obj.callback);
@@ -989,15 +988,15 @@ Multi.prototype.hmset = Multi.prototype.HMSET = function (key, args, callback) {
return this;
};
Multi.prototype.send_command = function (command, args, cb) {
Multi.prototype.send_command = function (command, args, index, cb) {
var self = this;
this._client.send_command(command, args, function (err, reply) {
if (err) {
if (cb) {
cb(err);
} else {
self.errors.push(err);
}
err.position = index - 1;
self.errors.push(err);
}
});
};
@@ -1023,7 +1022,7 @@ Multi.prototype.exec = Multi.prototype.EXEC = function (callback) {
break;
}
}
this.send_command(command, args, cb);
this.send_command(command, args, index, cb);
}
this._client.send_command('exec', [], function(err, replies) {
@@ -1036,9 +1035,10 @@ Multi.prototype.execute_callback = function (err, replies) {
if (err) {
if (err.code !== 'CONNECTION_BROKEN') {
err.code = 'EXECABORT';
err.errors = this.errors;
if (this.callback) {
this.errors.push(err);
this.callback(this.errors);
this.callback(err);
} else {
// Exclude CONNECTION_BROKEN so that error won't be emitted twice
this._client.emit('error', err);
@@ -1053,17 +1053,22 @@ Multi.prototype.execute_callback = function (err, replies) {
args = this.queue[i];
// If we asked for strings, even in detect_buffers mode, then return strings:
if (this._client.options.detect_buffers && this.wants_buffers[i] === false) {
replies[i - 1] = reply = reply_to_strings(reply);
}
// TODO - confusing and error-prone that hgetall is special cased in two places
if (reply && args[0] === "hgetall") {
replies[i - 1] = reply = reply_to_object(reply);
if (reply) {
if (this._client.options.detect_buffers && this.wants_buffers[i] === false) {
replies[i - 1] = reply = reply_to_strings(reply);
}
if (args[0] === "hgetall") {
// TODO - confusing and error-prone that hgetall is special cased in two places
replies[i - 1] = reply = reply_to_object(reply);
}
}
if (typeof args[args.length - 1] === "function") {
args[args.length - 1](null, reply);
if (reply instanceof Error) {
args[args.length - 1](reply);
} else {
args[args.length - 1](null, reply);
}
}
}
}