handle connect() timeout

amqp-node · Jun 30, 2015 · 76bd2fb · 76bd2fb
1 parent 72784e0
commit 76bd2fb
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/connect.js b/lib/connect.js
@@ -134,10 +134,6 @@ function connect(url, socketOptions, openCallback) {
   function onConnect() {
     sockok = true;
     sock.setNoDelay(noDelay);
-    if (timeout) {
-      sock.setTimeout(
-        timeout, openCallback.bind(this, new Error('connect ETIMEDOUT')));
-    }
     if (keepAlive) sock.setKeepAlive(keepAlive, keepAliveDelay);
 
     var c = new Connection(sock);
@@ -162,6 +158,11 @@ function connect(url, socketOptions, openCallback) {
     throw new Error("Expected amqp: or amqps: as the protocol; got " + protocol);
   }
 
+  if (timeout) {
+    sock.setTimeout(
+      timeout, openCallback.bind(this, new Error('connect ETIMEDOUT')));
+  }
+
   sock.once('error', function(err) {
     if (!sockok) openCallback(err);
   });