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

Fix issue reassembling ad-hoc event partials

Browse Source
This commit is contained in:
Matthew Jones
2017-01-23 16:30:44 -05:00
parent 8e2342b7c2
commit b3f4f3bea5
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/tasks.py
View File

@@ -1728,6 +1728,7 @@ class RunAdHocCommand(BaseTask):
env['CALLBACK_QUEUE'] = settings.CALLBACK_QUEUE env['CALLBACK_QUEUE'] = settings.CALLBACK_QUEUE
env['CALLBACK_CONNECTION'] = settings.BROKER_URL env['CALLBACK_CONNECTION'] = settings.BROKER_URL
env['ANSIBLE_SFTP_BATCH_MODE'] = 'False' env['ANSIBLE_SFTP_BATCH_MODE'] = 'False'
env['CACHE'] = settings.CACHES['default']['LOCATION'] if 'LOCATION' in settings.CACHES['default'] else ''
if getattr(settings, 'JOB_CALLBACK_DEBUG', False): if getattr(settings, 'JOB_CALLBACK_DEBUG', False):
env['JOB_CALLBACK_DEBUG'] = '2' env['JOB_CALLBACK_DEBUG'] = '2'
elif settings.DEBUG: elif settings.DEBUG:
@@ -1834,6 +1835,10 @@ class RunAdHocCommand(BaseTask):
def ad_hoc_command_event_callback(event_data): def ad_hoc_command_event_callback(event_data):
event_data.setdefault('ad_hoc_command_id', instance.id) event_data.setdefault('ad_hoc_command_id', instance.id)
if 'uuid' in event_data:
cache_event = cache.get('ev-{}'.format(event_data['uuid']), None)
if cache_event is not None:
event_data.update(cache_event)
dispatcher.dispatch(event_data) dispatcher.dispatch(event_data)
else: else:
def ad_hoc_command_event_callback(event_data): def ad_hoc_command_event_callback(event_data):