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

Add monitor transaction warning / error

Browse Source
This commit is contained in:
Ruben Bridgewater
2016-04-21 02:54:42 +02:00
parent f7c4d131be
commit eae16938cd
3 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/individualCommands.js
View File

@@ -71,14 +71,9 @@ Multi.prototype.monitor = Multi.prototype.MONITOR = function monitor (callback)
this.queue.push(['monitor', [], monitor_callback(this._client, callback)]);
return this;
}
var err = new Error(
'You used the monitor command in combination with a transaction. Due to faulty return values of ' +
'Redis in this context, the monitor command is now executed without transaction instead and ignored ' +
'in the multi statement.'
);
err.command = 'MONITOR';
utils.reply_in_order(this._client, callback, err);
this._client.monitor('monitor', callback);
// Set multi monitoring to indicate the exec that it should abort
// Remove this "hack" as soon as Redis might fix this
this.monitoring = true;
return this;
};

8
lib/multi.js
View File

@@ -85,6 +85,14 @@ function multi_callback (self, err, replies) {
}
Multi.prototype.exec_transaction = function exec_transaction (callback) {
if (this.monitoring || this._client.monitoring) {
var err = new Error(
'Using transaction with a client that is in monitor mode does not work due to faulty return values of Redis.'
);
err.command = 'EXEC';
err.code = 'EXECABORT';
return utils.reply_in_order(this._client, callback, err);
}
var self = this;
var len = self.queue.length;
self.errors = [];