Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixes to events/callbacks #32633

Merged
merged 2 commits into from
Nov 9, 2017
Merged

fixes to events/callbacks #32633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7d6e11
fixes to events/callbacks
bcoca Nov 7, 2017
eb75547
corrected display
bcoca Nov 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 6 additions & 9 deletions lib/ansible/plugins/callback/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,29 +310,26 @@ def v2_runner_on_unreachable(self, result):
host = result._host.get_name()
self.runner_on_unreachable(host, result._result)

def v2_runner_on_no_hosts(self, task):
self.runner_on_no_hosts()

# FIXME: not called
def v2_runner_on_async_poll(self, result):
host = result._host.get_name()
jid = result._result.get('ansible_job_id')
# FIXME, get real clock
clock = 0
self.runner_on_async_poll(host, result._result, jid, clock)

# FIXME: not called
def v2_runner_on_async_ok(self, result):
host = result._host.get_name()
jid = result._result.get('ansible_job_id')
self.runner_on_async_ok(host, result._result, jid)

# FIXME: not called
def v2_runner_on_async_failed(self, result):
host = result._host.get_name()
jid = result._result.get('ansible_job_id')
self.runner_on_async_failed(host, result._result, jid)

def v2_runner_on_file_diff(self, result, diff):
pass # no v1 correspondence

def v2_playbook_on_start(self, playbook):
self.playbook_on_start()

Expand All @@ -349,6 +346,7 @@ def v2_playbook_on_no_hosts_remaining(self):
def v2_playbook_on_task_start(self, task, is_conditional):
self.playbook_on_task_start(task.name, is_conditional)

# FIXME: not called
def v2_playbook_on_cleanup_task_start(self, task):
pass # no v1 correspondence

Expand All @@ -358,13 +356,12 @@ def v2_playbook_on_handler_task_start(self, task):
def v2_playbook_on_vars_prompt(self, varname, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None, default=None):
self.playbook_on_vars_prompt(varname, private, prompt, encrypt, confirm, salt_size, salt, default)

def v2_playbook_on_setup(self):
self.playbook_on_setup()

# FIXME: not called
def v2_playbook_on_import_for_host(self, result, imported_file):
host = result._host.get_name()
self.playbook_on_import_for_host(host, imported_file)

# FIXME: not called
def v2_playbook_on_not_import_for_host(self, result, missing_file):
host = result._host.get_name()
self.playbook_on_not_import_for_host(host, missing_file)
Expand Down
3 changes: 3 additions & 0 deletions lib/ansible/plugins/callback/default.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,3 +304,6 @@ def v2_runner_retry(self, result):
if (self._display.verbosity > 2 or '_ansible_verbose_always' in result._result) and '_ansible_verbose_override' not in result._result:
msg += "Result was: %s" % self._dump_results(result._result)
self._display.display(msg, color=C.COLOR_DEBUG)

def v2_playbook_on_notify(self, handler, host):
self._display.vv("NOTIFIED HANDLER %s for %s" % (handler.get_name(), host))
7 changes: 3 additions & 4 deletions lib/ansible/plugins/strategy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,8 +454,7 @@ def parent_handler_match(target_handler, handler_name):
self._notified_handlers[target_handler._uuid] = []
if original_host not in self._notified_handlers[target_handler._uuid]:
self._notified_handlers[target_handler._uuid].append(original_host)
# FIXME: should this be a callback?
display.vv("NOTIFIED HANDLER %s" % (handler_name,))
self._tqm.send_callback('v2_playbook_on_notify', target_handler, original_host)
else:
# As there may be more than one handler with the notified name as the
# parent, so we just keep track of whether or not we found one at all
Expand All @@ -465,7 +464,7 @@ def parent_handler_match(target_handler, handler_name):
found = True
if original_host not in self._notified_handlers[target_handler._uuid]:
self._notified_handlers[target_handler._uuid].append(original_host)
display.vv("NOTIFIED HANDLER %s" % (target_handler.get_name(),))
self._tqm.send_callback('v2_playbook_on_notify', target_handler, original_host)

if handler_name in self._listening_handlers:
for listening_handler_uuid in self._listening_handlers[handler_name]:
Expand All @@ -476,7 +475,7 @@ def parent_handler_match(target_handler, handler_name):
continue
if original_host not in self._notified_handlers[listening_handler._uuid]:
self._notified_handlers[listening_handler._uuid].append(original_host)
display.vv("NOTIFIED HANDLER %s" % (listening_handler.get_name(),))
self._tqm.send_callback('v2_playbook_on_notify', listening_handler, original_host)

# and if none were found, then we raise an error
if not found:
Expand Down