From bb9642f04c25b925b7b24f36540bd66059d4c424 Mon Sep 17 00:00:00 2001 From: Dana Powers Date: Wed, 5 Apr 2017 10:11:21 -0700 Subject: [PATCH] Catch socket.errors when sending / recving bytes on wake socketpair (#1069) --- kafka/client_async.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kafka/client_async.py b/kafka/client_async.py index cf62a8a..fbeb775 100644 --- a/kafka/client_async.py +++ b/kafka/client_async.py @@ -829,7 +829,9 @@ class KafkaClient(object): def wakeup(self): with self._wake_lock: - if self._wake_w.send(b'x') != 1: + try: + assert self._wake_w.send(b'x') == 1 + except (AssertionError, socket.error): log.warning('Unable to send to wakeup socket!') def _clear_wake_fd(self): @@ -837,7 +839,7 @@ class KafkaClient(object): while True: try: self._wake_r.recv(1024) - except: + except socket.error: break