From a7cbfd361d3742dd8c7b57f59666c6aa442c95e2 Mon Sep 17 00:00:00 2001
From: Mark Roberts <wizzat@gmail.com>
Date: Sat, 19 Apr 2014 11:00:44 -0700
Subject: Fix bug in socket timeout per PR #161 by maciejkula, add test

---
 kafka/conn.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kafka')

diff --git a/kafka/conn.py b/kafka/conn.py
index 4fdeb17..5dc3d5a 100644
--- a/kafka/conn.py
+++ b/kafka/conn.py
@@ -150,6 +150,6 @@ class KafkaConnection(local):
         """
         self.close()
         self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self._sock.connect((self.host, self.port))
         self._sock.settimeout(self.timeout)
+        self._sock.connect((self.host, self.port))
         self._dirty = False
-- 
cgit v1.2.1