From 03734015c50ae36eba87bfe1891b8ef378adc976 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Fri, 9 Dec 2016 11:15:20 -0500 Subject: [PATCH] set_stats support --- awx/lib/tower_display_callback/events.py | 5 +++++ awx/lib/tower_display_callback/module.py | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/awx/lib/tower_display_callback/events.py b/awx/lib/tower_display_callback/events.py index c17cf2c7f1..002c753c2e 100644 --- a/awx/lib/tower_display_callback/events.py +++ b/awx/lib/tower_display_callback/events.py @@ -180,6 +180,11 @@ class EventContext(object): for key in event_data.keys(): if key in ('job_id', 'ad_hoc_command_id', 'uuid', 'parent_uuid', 'created', 'artifact_data'): 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 diff --git a/awx/lib/tower_display_callback/module.py b/awx/lib/tower_display_callback/module.py index 59faa7ac79..cf266694f4 100644 --- a/awx/lib/tower_display_callback/module.py +++ b/awx/lib/tower_display_callback/module.py @@ -110,11 +110,7 @@ class BaseCallbackModule(CallbackBase): event_data.setdefault('uuid', str(uuid.uuid4())) if 'res' in event_data: - event_data['res'] = self.censor_result(copy.copy(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'] + event_data['res'] = self.censor_result(copy.deepcopy(event_data['res'])) if event not in self.EVENTS_WITHOUT_TASK: task = event_data.pop('task', None) @@ -329,6 +325,7 @@ class BaseCallbackModule(CallbackBase): ok=stats.ok, processed=stats.processed, skipped=stats.skipped, + artifact_data=stats.custom, ) with self.capture_event_data('playbook_on_stats', **event_data): super(BaseCallbackModule, self).v2_playbook_on_stats(stats)