summaryrefslogtreecommitdiff
path: root/kafka/conn.py
diff options
context:
space:
mode:
authorDana Powers <dana.powers@gmail.com>2014-05-05 21:07:15 -0700
committerDana Powers <dana.powers@gmail.com>2014-05-05 21:07:15 -0700
commit914c2e686acd3ad8f8c6dca6bf714e0b166dcbc3 (patch)
treeaf807e489e4e8c662786ad2a8b3ffafc37cfe1b0 /kafka/conn.py
parent2415609ce0899ef53e761e7ccb13177782d46c4e (diff)
parentef4648a0840bf8a212de5c7129d38e34cb335acb (diff)
downloadkafka-python-914c2e686acd3ad8f8c6dca6bf714e0b166dcbc3.tar.gz
Merge pull request #161 from maciejkula/bug/timeout_not_respected
Fix connection timeout in KafkaClient and KafkaConnection
Diffstat (limited to 'kafka/conn.py')
-rw-r--r--kafka/conn.py2
1 files changed, 1 insertions, 1 deletions
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