From 4be8a58592e63859964ca903fa09a7a31ba0c3a2 Mon Sep 17 00:00:00 2001 From: Dana Powers Date: Wed, 9 Dec 2015 15:32:41 -0800 Subject: Exception handling cleanup in BrokerConnection (also catch struct.errors in recv) --- kafka/conn.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kafka/conn.py') diff --git a/kafka/conn.py b/kafka/conn.py index 84a72aa..e9877f2 100644 --- a/kafka/conn.py +++ b/kafka/conn.py @@ -40,7 +40,7 @@ class BrokerConnection(local): sock = socket.create_connection((self.host, self.port), self.timeout) self._write_fd = sock.makefile('wb') self._read_fd = sock.makefile('rb') - except socket.error as e: + except socket.error: log.exception("Error in BrokerConnection.connect()") return None self.in_flight_requests.clear() @@ -54,7 +54,7 @@ class BrokerConnection(local): try: self._read_fd.close() self._write_fd.close() - except socket.error as e: + except socket.error: log.exception("Error in BrokerConnection.close()") pass self._read_fd = None @@ -74,7 +74,7 @@ class BrokerConnection(local): self._write_fd.write(size) self._write_fd.write(message) self._write_fd.flush() - except socket.error as e: + except socket.error: log.exception("Error in BrokerConnection.send()") self.close() return None @@ -98,7 +98,7 @@ class BrokerConnection(local): if correlation_id != recv_correlation_id: raise RuntimeError('Correlation ids do not match!') response = response_type.decode(self._read_fd) - except (RuntimeError, socket.error) as e: + except (RuntimeError, socket.error, struct.error): log.exception("Error in BrokerConnection.recv()") self.close() return None -- cgit v1.2.1