Broker connection uses the heartbeat setting from app config unless s…
…et otherwise (#4148) * broker connection uses the heartbeat setting from app config unless set otherwise * test for broker heartbeat settings * split long lines of code

…et otherwise (#4148) * broker connection uses the heartbeat setting from app config unless set otherwise * test for broker heartbeat settings * split long lines of code
celery
Unified Split

Showing with 15 additions and 1 deletion.

+1 −1 celery/app/base.py

+14 −0 t/unit/app/test_app.py
diff --git a/celery/app/base.py b/celery/app/base.py
@@ -826,7 +826,7 @@ def _connection(self, url, userid=None, password=None,
            port or conf.broker_port,
            transport=transport or conf.broker_transport,
            ssl=self.either('broker_use_ssl', ssl),
-            heartbeat=heartbeat,
+            heartbeat=heartbeat or self.conf.broker_heartbeat,
            login_method=login_method or conf.broker_login_method,
            failover_strategy=(
                failover_strategy or conf.broker_failover_strategy
diff --git a/t/unit/app/test_app.py b/t/unit/app/test_app.py
@@ -786,6 +786,20 @@ def my_failover_strategy(it):
        assert self.app.connection('amqp:////value') \
                       .failover_strategy == my_failover_strategy

+    def test_amqp_heartbeat_settings(self):
+        # Test default broker_heartbeat value
+        assert self.app.connection('amqp:////value') \
+                   .heartbeat == 0
+
+        # Test passing heartbeat through app configuration
+        self.app.conf.broker_heartbeat = 60
+        assert self.app.connection('amqp:////value') \
+                   .heartbeat == 60
+
+        # Test passing heartbeat as connection argument
+        assert self.app.connection('amqp:////value', heartbeat=30) \
+                   .heartbeat == 30
+
    def test_after_fork(self):
        self.app._pool = Mock()
        self.app.on_after_fork = Mock(name='on_after_fork')