External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-21 14:38:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6645 from ryanpetrello/some-more-iso-cleanup

Browse Source 
more ansible runner isolated cleanup

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-04-08 13:19:06 +00:00 committed by GitHub
commit 88d6dd96fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
awx/main/isolated/manager.py
View File

@ -268,13 +268,6 @@ class IsolatedManager(object):
# in the final sync
self.consume_events()
# emit an EOF event
event_data = {
'event': 'EOF',
'final_counter': len(self.handled_events)
}
self.event_handler(event_data)
return status, rc
def consume_events(self):
@ -420,8 +413,4 @@ class IsolatedManager(object):
status, rc = self.dispatch(playbook, module, module_args)
if status == 'successful':
status, rc = self.check()
else:
# emit an EOF event
event_data = {'event': 'EOF', 'final_counter': 0}
self.event_handler(event_data)
return status, rc

2
awx/main/tasks.py
View File

@ -1466,7 +1466,7 @@ class BaseTask(object):
params.get('module'),
module_args,
ident=str(self.instance.pk))
self.event_ct = len(isolated_manager_instance.handled_events)
self.finished_callback(None)
else:
res = ansible_runner.interface.run(**params)
status = res.status