External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

update artifacts to work with ansible set_stats

Browse Source
This commit is contained in:
Chris Meyers
2017-01-06 10:04:57 -05:00
parent 03734015c5
commit a1267a3dee
3 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/lib/tower_display_callback/events.py
View File

@@ -178,13 +178,8 @@ class EventContext(object):
event_data['res'] = {}
event_dict = dict(event=event, event_data=event_data)
for key in event_data.keys():
if key in ('job_id', 'ad_hoc_command_id', 'uuid', 'parent_uuid', 'created', 'artifact_data'):
if key in ('job_id', 'ad_hoc_command_id', 'uuid', 'parent_uuid', 'created',):
event_dict[key] = event_data.pop(key)
if key == 'artifact_data':
if '_run' in event_dict[key]:
event_dict[key] = event_dict[key]['_run']
else:
event_dict[key] = {}
elif key in ('verbosity', 'pid'):
event_dict[key] = event_data[key]
return event_dict

6
awx/lib/tower_display_callback/module.py
View File

@@ -315,6 +315,9 @@ class BaseCallbackModule(CallbackBase):
with self.capture_event_data('playbook_on_notify', **event_data):
super(BaseCallbackModule, self).v2_playbook_on_notify(result, handler)
'''
ansible_stats is, retoractively, added in 2.2
'''
def v2_playbook_on_stats(self, stats):
self.clear_play()
# FIXME: Add count of plays/tasks.
@@ -325,8 +328,9 @@ class BaseCallbackModule(CallbackBase):
ok=stats.ok,
processed=stats.processed,
skipped=stats.skipped,
artifact_data=stats.custom,
artifact_data=stats.custom.get('_run', {})
)
with self.capture_event_data('playbook_on_stats', **event_data):
super(BaseCallbackModule, self).v2_playbook_on_stats(stats)