External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 14:09:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

properly capture job events for adhoc commands run on isolated instances

Browse Source 
see: #7100
This commit is contained in:
Ryan Petrello
2017-07-17 14:49:27 -04:00
parent 1e20c61f05
commit 53259e4d24
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/isolated/isolated_manager.py
View File

@@ -412,11 +412,11 @@ class IsolatedManager(object):
instance.hostname, task_result.get('msg', 'unknown failure')))
@staticmethod
def wrap_stdout_handle(instance, private_data_dir, stdout_handle):
def wrap_stdout_handle(instance, private_data_dir, stdout_handle, event_data_key='job_id'):
dispatcher = CallbackQueueDispatcher()
def job_event_callback(event_data):
event_data.setdefault('job_id', instance.id)
event_data.setdefault(event_data_key, instance.id)
if 'uuid' in event_data:
filename = '{}-partial.json'.format(event_data['uuid'])
partial_filename = os.path.join(private_data_dir, 'artifacts', 'job_events', filename)