Merge pull request #161 from maciejkula/bug/timeout_not_respected

Fix connection timeout in KafkaClient and KafkaConnection

Author: dpkp

kafka/client.py

@@ -48,7 +48,7 @@ def _get_conn(self, host, port):
 
         host_key = (host, port)
         if host_key not in self.conns:
-            self.conns[host_key] = KafkaConnection(host, port)
+            self.conns[host_key] = KafkaConnection(host, port, timeout=self.timeout)
 
         return self.conns[host_key]
 

kafka/conn.py

@@ -150,6 +150,6 @@ def reinit(self):
         """
         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