From f9ecbca136157cb4efdd902449792ef927e18686 Mon Sep 17 00:00:00 2001 From: Simon Kelly Date: Tue, 9 Apr 2024 11:19:49 +0200 Subject: [PATCH] add custom properties to fomplayer config for DB connection pool --- environments/production/public.yml | 3 +++ .../roles/formplayer/templates/application.properties.j2 | 6 ++++++ src/commcare_cloud/ansible/roles/formplayer/vars/main.yml | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/environments/production/public.yml b/environments/production/public.yml index b79496c852..27b465fb14 100644 --- a/environments/production/public.yml +++ b/environments/production/public.yml @@ -75,6 +75,9 @@ formplayer_forward_ip_proxy: true formplayer_detailed_tags: - form_name - module_name +formplayer_custom_properties: + spring.datasource.hikari.maximum-pool-size: 20 + spring.datasource.hikari.minimum-idle: 5 KSPLICE_ACTIVE: yes diff --git a/src/commcare_cloud/ansible/roles/formplayer/templates/application.properties.j2 b/src/commcare_cloud/ansible/roles/formplayer/templates/application.properties.j2 index 69eab14ce3..2cbb84bc35 100644 --- a/src/commcare_cloud/ansible/roles/formplayer/templates/application.properties.j2 +++ b/src/commcare_cloud/ansible/roles/formplayer/templates/application.properties.j2 @@ -65,3 +65,9 @@ server.forward-headers-strategy=NATIVE {% if formplayer_detailed_tags is defined %} detailed_tagging.tag_names={{ formplayer_detailed_tags|join(',') }} {% endif %} + +# Per-environment custom properties +{% for key, value in formplayer_custom_properties.items() %} +{{ key }}={{ value }} +{% endfor %} +``` diff --git a/src/commcare_cloud/ansible/roles/formplayer/vars/main.yml b/src/commcare_cloud/ansible/roles/formplayer/vars/main.yml index 3628953171..addb18f304 100644 --- a/src/commcare_cloud/ansible/roles/formplayer/vars/main.yml +++ b/src/commcare_cloud/ansible/roles/formplayer/vars/main.yml @@ -23,3 +23,7 @@ formplayer_release_name: '{{ release_name }}-{{ env_monitoring_id }}' # Instructs Spring Boot to process X-FORWARDED-FOR headers. Should be set if behind a # trusted load balancer which forwards the original IP in headers. formplayer_forward_ip_proxy: false + +# Mapping to define custom properties to be set in the formplayer application.properties file +# Override this in your environment file to set custom properties +formplayer_custom_properties: {}