summaryrefslogtreecommitdiff
path: root/kafka/conn.py
diff options
context:
space:
mode:
authorMark Roberts <wizzat@gmail.com>2014-04-19 11:00:44 -0700
committerMark Roberts <wizzat@gmail.com>2014-04-19 11:00:44 -0700
commita7cbfd361d3742dd8c7b57f59666c6aa442c95e2 (patch)
treee65e40d0c2649504a67fdc9c5b17e0cc9575a7db /kafka/conn.py
parent1984dab59f8b6c39aeaeec383c68fffeea59d9d6 (diff)
downloadkafka-python-a7cbfd361d3742dd8c7b57f59666c6aa442c95e2.tar.gz
Fix bug in socket timeout per PR #161 by maciejkula, add test
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