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

Client to emit errors now instead of throwing them asynchronously where they're uncatchable.

Browse Source
This commit is contained in:
Bryce Baril
2013-12-21 11:08:00 -08:00
parent 34a2375bec
commit 6a3ccf64f4
2 changed files with 74 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
index.js
View File

@@ -147,9 +147,7 @@ RedisClient.prototype.flush_and_error = function (message) {
try {
command_obj.callback(error);
} catch (callback_err) {
process.nextTick(function () {
throw callback_err;
});
this.emit("error", callback_err);
}
}
}
@@ -161,9 +159,7 @@ RedisClient.prototype.flush_and_error = function (message) {
try {
command_obj.callback(error);
} catch (callback_err) {
process.nextTick(function () {
throw callback_err;
});
this.emit("error", callback_err);
}
}
}
@@ -559,24 +555,18 @@ RedisClient.prototype.return_error = function (err) {
try {
command_obj.callback(err);
} catch (callback_err) {
// if a callback throws an exception, re-throw it on a new stack so the parser can keep going
process.nextTick(function () {
throw callback_err;
});
this.emit("error", callback_err);
}
} else {
console.log("node_redis: no callback to send error: " + err.message);
// this will probably not make it anywhere useful, but we might as well throw
process.nextTick(function () {
throw err;
});
this.emit("error", err);
}
};
// if a callback throws an exception, re-throw it on a new stack so the parser can keep going.
// if a domain is active, emit the error on the domain, which will serve the same function.
// put this try/catch in its own function because V8 doesn't optimize this well yet.
function try_callback(callback, reply) {
function try_callback(client, callback, reply) {
try {
callback(null, reply);
} catch (err) {
@@ -584,9 +574,7 @@ function try_callback(callback, reply) {
process.domain.emit('error', err);
process.domain.exit();
} else {
process.nextTick(function () {
throw err;
});
client.emit("error", err);
}
}
}
@@ -668,7 +656,7 @@ RedisClient.prototype.return_reply = function (reply) {
reply = reply_to_object(reply);
}
try_callback(command_obj.callback, reply);
try_callback(this, command_obj.callback, reply);
} else if (exports.debug_mode) {
console.log("no callback for reply: " + (reply && reply.toString && reply.toString()));
}
@@ -694,7 +682,7 @@ RedisClient.prototype.return_reply = function (reply) {
// reply[1] can be null
var reply1String = (reply[1] === null) ? null : reply[1].toString();
if (command_obj && typeof command_obj.callback === "function") {
try_callback(command_obj.callback, reply1String);
try_callback(this, command_obj.callback, reply1String);
}
this.emit(type, reply1String, reply[2]); // channel, count
} else {