Merge pull request #290 from luin/fix/connection-error

fix: fix wrong host not causing error
redis · Apr 30, 2016 · 02eb721 · 02eb721
2 parents 4e4f5e2 + 25c300e
commit 02eb721
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lib/redis.js b/lib/redis.js
@@ -276,6 +276,12 @@ Redis.prototype.connect = function (callback) {
         stream.setTimeout(_this.options.connectTimeout, function () {
           stream.setTimeout(0);
           stream.destroy();
+
+          var err = new Error('connect ETIMEDOUT');
+          err.errorno = 'ETIMEDOUT';
+          err.code = 'ETIMEDOUT';
+          err.syscall = 'connect';
+          eventHandler.errorHandler(_this)(err);
         });
         stream.once(CONNECT_EVENT, function () {
           stream.setTimeout(0);

diff --git a/test/functional/connection.js b/test/functional/connection.js
@@ -48,9 +48,18 @@ describe('connection', function () {
       connectTimeout: 1,
       retryStrategy: null
     });
+    var pending = 2;
+    redis.on('error', function (err) {
+      expect(err.message).to.eql('connect ETIMEDOUT');
+      if (!--pending) {
+        done();
+      }
+    });
     redis.get('foo', function (err) {
       expect(err.message).to.match(/Connection is closed/);
-      done();
+      if (!--pending) {
+        done();
+      }
     });
   });