From 9c444e084eebb7cafb30304e65f01c7520c4dd98 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Wed, 14 Dec 2016 16:37:44 -0500 Subject: [PATCH] Handle psutil errors when terminating tasks. --- awx/main/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 2f862e61c2..6d119ce29a 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -618,7 +618,7 @@ class BaseTask(Task): for child_proc in child_procs: os.kill(child_proc.pid, signal.SIGKILL) os.kill(main_proc.pid, signal.SIGKILL) - except TypeError: + except (TypeError, psutil.Error): os.kill(job.pid, signal.SIGKILL) else: os.kill(job.pid, signal.SIGTERM)