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

set_stats support

Browse Source
This commit is contained in:
Chris Meyers
2016-12-09 11:15:20 -05:00
parent ade758af87
commit 03734015c5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,6 +180,11 @@ class EventContext(object):
for key in event_data.keys(): 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', 'artifact_data'):
event_dict[key] = event_data.pop(key) 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'): elif key in ('verbosity', 'pid'):
event_dict[key] = event_data[key] event_dict[key] = event_data[key]
return event_dict return event_dict

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

@@ -110,11 +110,7 @@ class BaseCallbackModule(CallbackBase):
event_data.setdefault('uuid', str(uuid.uuid4())) event_data.setdefault('uuid', str(uuid.uuid4()))
if 'res' in event_data: if 'res' in event_data:
event_data['res'] = self.censor_result(copy.copy(event_data['res'])) event_data['res'] = self.censor_result(copy.deepcopy(event_data['res']))
res = event_data.get('res', None)
if res and isinstance(res, dict):
if 'artifact_data' in res:
event_data['artifact_data'] = res['artifact_data']
if event not in self.EVENTS_WITHOUT_TASK: if event not in self.EVENTS_WITHOUT_TASK:
task = event_data.pop('task', None) task = event_data.pop('task', None)
@@ -329,6 +325,7 @@ class BaseCallbackModule(CallbackBase):
ok=stats.ok, ok=stats.ok,
processed=stats.processed, processed=stats.processed,
skipped=stats.skipped, skipped=stats.skipped,
artifact_data=stats.custom,
) )
with self.capture_event_data('playbook_on_stats', **event_data): with self.capture_event_data('playbook_on_stats', **event_data):
super(BaseCallbackModule, self).v2_playbook_on_stats(stats) super(BaseCallbackModule, self).v2_playbook_on_stats(stats)