summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kafka/client.py2
-rw-r--r--kafka/conn.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/kafka/client.py b/kafka/client.py
index 39c89ba..5dee7b7 100644
--- a/kafka/client.py
+++ b/kafka/client.py
@@ -48,7 +48,7 @@ class KafkaClient(object):
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]
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