internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 13:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning up some of the notify/facts logic added earlier to fix problems

Browse Source
This commit is contained in:
James Cammarata
2015-07-17 14:44:05 -04:00
parent 1aa4155266
commit 271a7f3281
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/ansible/executor/process/result.py
View File

@@ -131,16 +131,17 @@ class ResultProcess(multiprocessing.Process):
for result_item in result_items:
# if this task is notifying a handler, do it now
if 'ansible_notify' in result_item and result.is_changed():
# The shared dictionary for notified handlers is a proxy, which
# does not detect when sub-objects within the proxy are modified.
# So, per the docs, we reassign the list so the proxy picks up and
# notifies all other threads
for notify in result_item['ansible_notify']:
if result._task._role:
role_name = result._task._role.get_name()
notify = "%s : %s" % (role_name, notify)
self._send_result(('notify_handler', result._host, notify))
if 'ansible_notify' in result_item:
if result.is_changed():
# The shared dictionary for notified handlers is a proxy, which
# does not detect when sub-objects within the proxy are modified.
# So, per the docs, we reassign the list so the proxy picks up and
# notifies all other threads
for notify in result_item['ansible_notify']:
if result._task._role:
role_name = result._task._role.get_name()
notify = "%s : %s" % (role_name, notify)
self._send_result(('notify_handler', result._host, notify))
# now remove the notify field from the results, as its no longer needed
result_item.pop('ansible_notify')

2
lib/ansible/executor/task_executor.py
View File

@@ -333,7 +333,7 @@ class TaskExecutor:
# save the notification target in the result, if it was specified, as
# this task may be running in a loop in which case the notification
# may be item-specific, ie. "notify: service {{item}}"
if self._task.notify:
if self._task.notify is not None:
result['ansible_notify'] = self._task.notify
# and return