diff options
Diffstat (limited to 'kafka/conn.py')
| -rw-r--r-- | kafka/conn.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kafka/conn.py b/kafka/conn.py index b451895..21607d9 100644 --- a/kafka/conn.py +++ b/kafka/conn.py @@ -575,15 +575,15 @@ class BrokerConnection(object): log.warning('%s: No in-flight-requests to recv', self) return None - elif self._requests_timed_out(): + response = self._recv() + if not response and self.requests_timed_out(): log.warning('%s timed out after %s ms. Closing connection.', self, self.config['request_timeout_ms']) self.close(error=Errors.RequestTimedOutError( 'Request timed out after %s ms' % self.config['request_timeout_ms'])) return None - - return self._recv() + return response def _recv(self): # Not receiving is the state of reading the payload header @@ -719,7 +719,7 @@ class BrokerConnection(object): self._processing = False return response - def _requests_timed_out(self): + def requests_timed_out(self): if self.in_flight_requests: oldest_at = self.in_flight_requests[0].timestamp timeout = self.config['request_timeout_ms'] / 1000.0 |