From 6b4219badbb5d5a4b9027063f5cc5c25e0753e66 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Tue, 7 Apr 2020 19:00:15 -0400 Subject: [PATCH] more ansible runner isolated cleanup follow-up to https://github.com/ansible/awx/pull/6296 --- awx/main/isolated/manager.py | 11 ----------- awx/main/tasks.py | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/awx/main/isolated/manager.py b/awx/main/isolated/manager.py index 176fea9e82..6c991d85ea 100644 --- a/awx/main/isolated/manager.py +++ b/awx/main/isolated/manager.py @@ -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 diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 1f82b8ab92..6374815769 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -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