From a30cd4e8b5b8bd4a36e9e7cd921f93160831208e Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Tue, 12 Aug 2025 04:38:41 +0200
Subject: [PATCH] Solved listmonk handler bugs

---
 roles/dev-python-pip/tasks/main.yml      | 3 ++-
 roles/srv-web-7-4-core/tasks/01_core.yml | 2 ++
 roles/update-pip/tasks/main.yml          | 2 ++
 roles/web-app-listmonk/vars/main.yml     | 5 +++++
 tasks/utils/run_once.yml                 | 1 +
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/roles/dev-python-pip/tasks/main.yml b/roles/dev-python-pip/tasks/main.yml
index 16d73141..b0d35e82 100644
--- a/roles/dev-python-pip/tasks/main.yml
+++ b/roles/dev-python-pip/tasks/main.yml
@@ -10,5 +10,6 @@
       state: present
 
   - include_tasks: utils/run_once.yml
-
+    vars:
+      flush_handlers: false
   when: run_once_dev_python_pip is not defined
diff --git a/roles/srv-web-7-4-core/tasks/01_core.yml b/roles/srv-web-7-4-core/tasks/01_core.yml
index ce7f4370..aa831ca1 100644
--- a/roles/srv-web-7-4-core/tasks/01_core.yml
+++ b/roles/srv-web-7-4-core/tasks/01_core.yml
@@ -4,6 +4,8 @@
   loop:
     - sys-hlth-webserver
     - sys-hlth-csp
+  vars:
+    flush_handlers: false
 
 - name: Include openresty
   # Outside of run_once block is necessary for handler loading
diff --git a/roles/update-pip/tasks/main.yml b/roles/update-pip/tasks/main.yml
index 993bfc4a..87fe5b71 100644
--- a/roles/update-pip/tasks/main.yml
+++ b/roles/update-pip/tasks/main.yml
@@ -4,4 +4,6 @@
       name: dev-python-pip
     when: run_once_dev_python_pip is not defined
   - include_tasks: utils/run_once.yml
+    vars:
+      flush_handlers: false
   when: run_once_update_pip is not defined
diff --git a/roles/web-app-listmonk/vars/main.yml b/roles/web-app-listmonk/vars/main.yml
index 26c9a670..8c503b9d 100644
--- a/roles/web-app-listmonk/vars/main.yml
+++ b/roles/web-app-listmonk/vars/main.yml
@@ -2,6 +2,11 @@ application_id: "web-app-listmonk"
 database_type:  "postgres"
 
 container_port:   "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.port', True) }}"
+
+# Docker specific
+docker_compose_flush_handlers: false
+
+# Listmonk Specific
 listmonk_version: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.version', True) }}"
 listmonk_image:   "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.image', True) }}"
 listmonk_name:    "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.name', True) }}"
diff --git a/tasks/utils/run_once.yml b/tasks/utils/run_once.yml
index c7bcbfe5..5a512579 100644
--- a/tasks/utils/run_once.yml
+++ b/tasks/utils/run_once.yml
@@ -10,6 +10,7 @@
     - (application_id | get_entity_name) == (docker_compose.directories.instance | basename)
 
 - meta: flush_handlers
+  when: flush_handlers | default(true) | bool
 
 - name: Set “run-once” fact for role {{ role_name }}
   set_fact: