From ee42ae8571f6fdb062876e62398bacc5274baf15 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Fri, 16 Jan 2015 12:30:20 -0500 Subject: [PATCH] Support older versions of psutil that don't implement as_dict(). --- awx/plugins/callback/job_event_callback.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/awx/plugins/callback/job_event_callback.py b/awx/plugins/callback/job_event_callback.py index a9783eb28c..1a613eb787 100644 --- a/awx/plugins/callback/job_event_callback.py +++ b/awx/plugins/callback/job_event_callback.py @@ -307,15 +307,17 @@ class CallbackModule(object): ssh_cm_procs = [] for proc in psutil.process_iter(): try: - pinfo = proc.as_dict(attrs=['pid', 'name', 'cmdline', 'username']) + pname = proc.name + pcmdline = proc.cmdline + pusername = proc.username except psutil.NoSuchProcess: continue - if pinfo['username'] != username: + if pusername != username: continue - if pinfo['name'] != 'ssh': + if pname != 'ssh': continue for cp_file in cp_files: - if pinfo['cmdline'] and cp_file in pinfo['cmdline'][0]: + if pcmdline and cp_file in pcmdline[0]: ssh_cm_procs.append(proc) break