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

Fix js parser sending non-Errors

Browse Source
This commit is contained in:
Ruben Bridgewater
2015-09-02 00:43:08 +02:00
parent 614366ffeb
commit 52db91c753
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
index.js
View File

@@ -302,11 +302,7 @@ RedisClient.prototype.init_parser = function () {
// "reply error" is an error sent back by Redis // "reply error" is an error sent back by Redis
this.reply_parser.on("reply error", function (reply) { this.reply_parser.on("reply error", function (reply) {
if (reply instanceof Error) { self.return_error(reply);
self.return_error(reply);
} else {
self.return_error(new Error(reply));
}
}); });
this.reply_parser.on("reply", function (reply) { this.reply_parser.on("reply", function (reply) {
self.return_reply(reply); self.return_reply(reply);
@@ -654,7 +650,9 @@ RedisClient.prototype.return_reply = function (reply) {
} }
try_callback(command_obj.callback, reply); try_callback(command_obj.callback, reply);
} else debug("no callback for reply: " + (reply && reply.toString && reply.toString())); } else {
debug("no callback for reply: " + (reply && reply.toString && reply.toString()));
}
} else if (this.pub_sub_mode || (command_obj && command_obj.sub_command)) { } else if (this.pub_sub_mode || (command_obj && command_obj.sub_command)) {
if (Array.isArray(reply)) { if (Array.isArray(reply)) {
type = reply[0].toString(); type = reply[0].toString();

3
lib/parser/javascript.js
View File

@@ -177,8 +177,7 @@ ReplyParser.prototype.execute = function (buffer) {
if (ret === null) { if (ret === null) {
break; break;
} }
this.send_error(new Error(ret));
this.send_error(ret);
} else if (type === 58) { // : } else if (type === 58) { // :
ret = this._parseResult(type); ret = this._parseResult(type);