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

All Multi objects to be re-used.

Browse Source
This commit is contained in:
Matt Ranney
2010-09-24 14:03:36 -07:00
parent 85b0f6009d
commit 155d321544
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
index.js
View File

@@ -356,6 +356,9 @@ function RedisClient(stream) {
self.stream.setNoDelay(); self.stream.setNoDelay();
self.stream.setTimeout(0); self.stream.setTimeout(0);
// give connect listeners a chance to run first in case they need to auth
self.emit("connect");
var command_obj; var command_obj;
while (self.offline_queue.length > 0) { while (self.offline_queue.length > 0) {
command_obj = self.offline_queue.shift(); command_obj = self.offline_queue.shift();
@@ -364,8 +367,6 @@ function RedisClient(stream) {
} }
self.send_command(command_obj.command, command_obj.args, command_obj.callback); self.send_command(command_obj.command, command_obj.args, command_obj.callback);
} }
self.emit("connect");
}); });
this.stream.on("data", function (buffer_from_socket) { this.stream.on("data", function (buffer_from_socket) {
@@ -662,7 +663,6 @@ exports.commands = [
"INFO", "MONITOR", "SLAVEOF", "CONFIG", "INFO", "MONITOR", "SLAVEOF", "CONFIG",
// Publish/Subscribe // Publish/Subscribe
"PUBLISH", "SUBSCRIBE", "PSUBSCRIBE", "UNSUBSCRIBE", "PUNSUBSCRIBE", "PUBLISH", "SUBSCRIBE", "PSUBSCRIBE", "UNSUBSCRIBE", "PUNSUBSCRIBE",
"MULTI", "EXEC",
// Undocumented commands // Undocumented commands
"PING", "PING",
]; ];
@@ -703,11 +703,13 @@ Multi.prototype.exec = function(callback) {
// drain queue, callback will catch "QUEUED" or error // drain queue, callback will catch "QUEUED" or error
this.queue.forEach(function(args, index) { this.queue.forEach(function(args, index) {
var command = args.shift(); var command = args[0];
if (typeof args[args.length - 1] === "function") { if (typeof args[args.length - 1] === "function") {
args = args.slice(0, -1); args = args.slice(1, -1);
} else {
args = args.slice(1);
} }
this.client[command](args, function (err, reply){ this.client.send_command(command, args, function (err, reply){
if (err) { if (err) {
var cur = self.queue[index]; var cur = self.queue[index];
if (typeof cur[cur.length -1] === "function") { if (typeof cur[cur.length -1] === "function") {
@@ -720,7 +722,7 @@ Multi.prototype.exec = function(callback) {
}); });
}, this); }, this);
this.client.EXEC(function (err, reply) { this.client.send_command("EXEC", function (err, reply) {
if (err) { if (err) {
if (callback) { if (callback) {
callback(new Error(err)); callback(new Error(err));
@@ -744,6 +746,9 @@ Multi.prototype.exec = function(callback) {
RedisClient.prototype.multi = function (args) { RedisClient.prototype.multi = function (args) {
return new Multi(this, args); return new Multi(this, args);
}; };
RedisClient.prototype.MULTI = function (args) {
return new Multi(this, args);
};
exports.createClient = function (port_arg, host_arg, options) { exports.createClient = function (port_arg, host_arg, options) {
var port = port_arg || default_port, var port = port_arg || default_port,