diff options
| author | Dana Powers <dana.powers@gmail.com> | 2014-05-05 21:07:15 -0700 |
|---|---|---|
| committer | Dana Powers <dana.powers@gmail.com> | 2014-05-05 21:07:15 -0700 |
| commit | 914c2e686acd3ad8f8c6dca6bf714e0b166dcbc3 (patch) | |
| tree | af807e489e4e8c662786ad2a8b3ffafc37cfe1b0 | |
| parent | 2415609ce0899ef53e761e7ccb13177782d46c4e (diff) | |
| parent | ef4648a0840bf8a212de5c7129d38e34cb335acb (diff) | |
| download | kafka-python-914c2e686acd3ad8f8c6dca6bf714e0b166dcbc3.tar.gz | |
Merge pull request #161 from maciejkula/bug/timeout_not_respected
Fix connection timeout in KafkaClient and KafkaConnection
| -rw-r--r-- | kafka/client.py | 2 | ||||
| -rw-r--r-- | kafka/conn.py | 2 |
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 |