diff --git a/kombu/mixins.py b/kombu/mixins.py index 14c1c1b9..92acee98 100644 --- a/kombu/mixins.py +++ b/kombu/mixins.py @@ -195,10 +195,11 @@ class ConsumerMixin: try: conn.drain_events(timeout=safety_interval) except socket.timeout: - conn.heartbeat_check() - elapsed += safety_interval - if timeout and elapsed >= timeout: - raise + if timeout: + conn.heartbeat_check() + elapsed += safety_interval + if elapsed >= timeout: + raise except OSError: if not self.should_stop: raise