redis 3.0.1 → 3.0.2

package/README.md

@@ -12,7 +12,6 @@
     <a href="https://www.npmjs.com/package/redis"><img src="https://img.shields.io/npm/dm/redis.svg?style=flat-square" alt="NPM downloads"></a>
     <a href="https://www.npmjs.com/package/redis"><img src="https://img.shields.io/npm/v/redis.svg?style=flat-square" alt="NPM version"></a>
     <a href="https://travis-ci.org/NodeRedis/node-redis"><img src="https://travis-ci.org/NodeRedis/node-redis.svg?style=flat-square&branch=master" alt="Build Status" /></a>
-    <a href="https://ci.appveyor.com/project/BridgeAR/node-redis/branch/master"><img src="https://img.shields.io/appveyor/ci/BridgeAR/node-redis/master.svg?style=flat-square&label=Windows%20Tests" alt="Windows Tests" /></a>
     <a href="https://coveralls.io/r/NodeRedis/node-redis?branch="><img src="https://coveralls.io/repos/NodeRedis/node-redis/badge.svg?style=flat-square&branch=" alt="Coverage Status" /></a>
     <a href="https://twitter.com/NodeRedis"><img src="https://img.shields.io/twitter/follow/NodeRedis.svg?style=flat-square&colorA=1da1f2&colorB=&label=Follow%20on%20Twitter" alt="Follow on Twitter"></a>
 </p>

package/index.js

@@ -556,12 +556,8 @@ RedisClient.prototype.connection_gone = function (why, error) {
             if (this.retry_delay instanceof Error) {
                 error = this.retry_delay;
             }
-            var errorMessage = 'Redis connection in broken state: ';
-            if (this.retry_totaltime >= this.connect_timeout) {
-                errorMessage += 'connection timeout exceeded.';
-            } else {
-                errorMessage += 'maximum connection attempts exceeded.';
-            }
+
+            var errorMessage = 'Redis connection in broken state: retry aborted.';
 
             this.flush_and_error({
                 message: errorMessage,
@@ -581,13 +577,7 @@ RedisClient.prototype.connection_gone = function (why, error) {
     }
 
     if (this.retry_totaltime >= this.connect_timeout) {
-        var message = 'Redis connection in broken state: ';
-        if (this.retry_totaltime >= this.connect_timeout) {
-            message += 'connection timeout exceeded.';
-        } else {
-            message += 'maximum connection attempts exceeded.';
-        }
-
+        var message = 'Redis connection in broken state: connection timeout exceeded.';
         this.flush_and_error({
             message: message,
             code: 'CONNECTION_BROKEN',
@@ -864,11 +854,9 @@ RedisClient.prototype.internal_send_command = function (command_obj) {
             if (command_obj.args && command_obj.args.length) {
                 undefinedArgError.args = command_obj.args;
             }
-            if (command_obj.callback) {
-                command_obj.callback(undefinedArgError);
-                return false;
-            }
-            throw undefinedArgError;
+            // there is always a callback in this scenario
+            command_obj.callback(undefinedArgError);
+            return false;
         } else {
             // Seems like numbers are converted fast using string concatenation
             args_copy[i] = '' + args[i];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redis",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "A high performance Redis client.",
   "keywords": [
     "database",