Merge pull request #6229 from dimagi/gh/celery/set-broker-heartbeat

[India] Set broker heartbeat to match timeout specified in rabbitmq.conf
dimagi · Feb 19, 2024 · e0cbc24 · e0cbc24
2 parents 4ab88f2 + 14ebdf7
commit e0cbc24
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/environments/india/public.yml b/environments/india/public.yml
@@ -122,6 +122,7 @@ localsettings:
   BANK_ADDRESS: { 'first_line': "1 Citizens Drive", 'city': "Riverside", 'region': "RI", 'postal_code': "02915" }
   BANK_NAME: "RBS Citizens N.A."
   BANK_SWIFT_CODE: 'CTZIUS33'
+  CELERY_BROKER_HEARTBEAT: 600
 #  COUCH_CACHE_DOCS:
 #  COUCH_CACHE_VIEWS:
   CONNECTID_URL: 'https://connectid.dimagi.com/o/userinfo'

diff --git a/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2 b/src/commcare_cloud/ansible/roles/commcarehq/templates/localsettings.py.j2
@@ -396,6 +396,9 @@ CELERY_BROKER_WRITE_URL = BROKER_WRITE_URL = '{{ BROKER_URL }}'
 {% else %}
 CELERY_BROKER_URL = BROKER_URL = '{{ BROKER_URL }}'
 {% endif %}
+{% if 'CELERY_BROKER_HEARTBEAT' in localsettings and localsettings.CELERY_BROKER_HEARTBEAT %}
+CELERY_BROKER_HEARTBEAT = '{{ localsettings.CELERY_BROKER_HEARTBEAT }}'
+{% endif %}
 CELERY_HEARTBEAT_THRESHOLDS = {
 {% for queue, threshold in CELERY_HEARTBEAT_THRESHOLDS.items() | sort %}
     {{ queue | to_json }}: {% if threshold == None %}None{% else %}{{ threshold | to_json }}{% endif %},