summaryrefslogtreecommitdiff
path: root/lib/ansible/executor
diff options
context:
space:
mode:
authorMatt Martz <matt@sivel.net>2019-08-22 14:32:49 -0500
committerGitHub <noreply@github.com>2019-08-22 14:32:49 -0500
commit0ff9978bc51cc262233f1b02850de6f9dcee26a9 (patch)
tree7c68ac5b149d1c0acfc593f733d4c50e2e415443 /lib/ansible/executor
parent5b16e012a49b81c2aa87bb777a5ed05328187c40 (diff)
downloadansible-0ff9978bc51cc262233f1b02850de6f9dcee26a9.tar.gz
Ensure has_dead_workers functions (#60653)
* Ensure has_dead_workers functions * Fix up tests * Add changelog. Fixes #29124
Diffstat (limited to 'lib/ansible/executor')
-rw-r--r--lib/ansible/executor/task_queue_manager.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/ansible/executor/task_queue_manager.py b/lib/ansible/executor/task_queue_manager.py
index 336e148767..cee7571008 100644
--- a/lib/ansible/executor/task_queue_manager.py
+++ b/lib/ansible/executor/task_queue_manager.py
@@ -286,10 +286,9 @@ class TaskQueueManager:
# <WorkerProcess(WorkerProcess-2, stopped[SIGTERM])>
defunct = False
- for (idx, x) in enumerate(self._workers):
- if hasattr(x, 'exitcode'):
- if x.exitcode in [-9, -11, -15]:
- defunct = True
+ for x in self._workers:
+ if getattr(x, 'exitcode', None):
+ defunct = True
return defunct
def send_callback(self, method_name, *args, **kwargs):