mirror of
https://github.com/ansible/awx.git
synced 2026-05-16 05:47:38 -02:30
more ansible runner isolated cleanup
follow-up to https://github.com/ansible/awx/pull/6296
This commit is contained in:
@@ -268,13 +268,6 @@ class IsolatedManager(object):
|
|||||||
# in the final sync
|
# in the final sync
|
||||||
self.consume_events()
|
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
|
return status, rc
|
||||||
|
|
||||||
def consume_events(self):
|
def consume_events(self):
|
||||||
@@ -420,8 +413,4 @@ class IsolatedManager(object):
|
|||||||
status, rc = self.dispatch(playbook, module, module_args)
|
status, rc = self.dispatch(playbook, module, module_args)
|
||||||
if status == 'successful':
|
if status == 'successful':
|
||||||
status, rc = self.check()
|
status, rc = self.check()
|
||||||
else:
|
|
||||||
# emit an EOF event
|
|
||||||
event_data = {'event': 'EOF', 'final_counter': 0}
|
|
||||||
self.event_handler(event_data)
|
|
||||||
return status, rc
|
return status, rc
|
||||||
|
|||||||
@@ -1466,7 +1466,7 @@ class BaseTask(object):
|
|||||||
params.get('module'),
|
params.get('module'),
|
||||||
module_args,
|
module_args,
|
||||||
ident=str(self.instance.pk))
|
ident=str(self.instance.pk))
|
||||||
self.event_ct = len(isolated_manager_instance.handled_events)
|
self.finished_callback(None)
|
||||||
else:
|
else:
|
||||||
res = ansible_runner.interface.run(**params)
|
res = ansible_runner.interface.run(**params)
|
||||||
status = res.status
|
status = res.status
|
||||||
|
|||||||
Reference in New Issue
Block a user