Revert: allow users to disable broker heartbeats by not providing a t…

…imeout (#2097, #2016)
celery · Sep 5, 2024 · 33490ad · 33490ad
1 parent f3ccc31
commit 33490ad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/kombu/mixins.py b/kombu/mixins.py
@@ -195,11 +195,10 @@ def consume(self, limit=None, timeout=None, safety_interval=1, **kwargs):
                 try:
                     conn.drain_events(timeout=safety_interval)
                 except socket.timeout:
-                    if timeout:
-                        conn.heartbeat_check()
-                        elapsed += safety_interval
-                        if elapsed >= timeout:
-                            raise
+                    conn.heartbeat_check()
+                    elapsed += safety_interval
+                    if timeout and elapsed >= timeout:
+                        raise
                 except OSError:
                     if not self.should_stop:
                         raise

diff --git a/t/unit/test_mixins.py b/t/unit/test_mixins.py
@@ -91,7 +91,7 @@ def se(*args, **kwargs):
             next(it)
         c.connection.heartbeat_check.assert_called()
 
-    def test_consume_drain_no_heartbeat_check(self):
+    def test_consume_drain_heartbeat_check_no_timeout(self):
         c, Acons, Bcons = self._context()
         c.should_stop = False
         it = c.consume(no_ack=True, timeout=None)
@@ -102,13 +102,13 @@ def se(*args, **kwargs):
         c.connection.drain_events.side_effect = se
         with pytest.raises(StopIteration):
             next(it)
-        c.connection.heartbeat_check.assert_not_called()
+        c.connection.heartbeat_check.assert_called()
 
         it = c.consume(no_ack=True, timeout=0)
         c.connection.drain_events.side_effect = se
         with pytest.raises(StopIteration):
             next(it)
-        c.connection.heartbeat_check.assert_not_called()
+        c.connection.heartbeat_check.assert_called()
 
     def test_Consumer_context(self):
         c, Acons, Bcons = self._context()