summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2016-06-21 10:00:10 -0500
committerJames Cammarata <jimi@sngx.net>2016-06-21 10:00:10 -0500
commit15e648dd94e67e26b78d242414059f4dfc4e66fa (patch)
tree400e561bd6a30ea685de1e35539e8c11f6de61df
parentb7f9037b5bd31ca54a883b05dc5957551a378032 (diff)
downloadansible-15e648dd94e67e26b78d242414059f4dfc4e66fa.tar.gz
Fix handler listeners as a list
The listen statement on handlers should have supported a list, however it was broken in the revision of the pub/sub feature based on the handler revamp. This patch corrects the bug, so this works again: - name: some handler ... listen: - some target - another target Fixes #16378
-rw-r--r--lib/ansible/executor/task_queue_manager.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/ansible/executor/task_queue_manager.py b/lib/ansible/executor/task_queue_manager.py
index 10f3b50d4b..25c3469d38 100644
--- a/lib/ansible/executor/task_queue_manager.py
+++ b/lib/ansible/executor/task_queue_manager.py
@@ -149,9 +149,13 @@ class TaskQueueManager:
if handler not in self._notified_handlers:
self._notified_handlers[handler] = []
if handler.listen:
- if handler.listen not in self._listening_handlers:
- self._listening_handlers[handler.listen] = []
- self._listening_handlers[handler.listen].append(handler.get_name())
+ listeners = handler.listen
+ if not isinstance(listeners, list):
+ listeners = [ listeners ]
+ for listener in listeners:
+ if listener not in self._listening_handlers:
+ self._listening_handlers[listener] = []
+ self._listening_handlers[listener].append(handler.get_name())
def load_callbacks(self):
'''