External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Support older versions of psutil that don't implement as_dict().

Browse Source
This commit is contained in:
Chris Church
2015-01-16 12:30:20 -05:00
parent d8af3198fc
commit ee42ae8571
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/plugins/callback/job_event_callback.py
View File

@@ -307,15 +307,17 @@ class CallbackModule(object):
ssh_cm_procs = [] ssh_cm_procs = []
for proc in psutil.process_iter(): for proc in psutil.process_iter():
try: try:
pinfo = proc.as_dict(attrs=['pid', 'name', 'cmdline', 'username']) pname = proc.name
pcmdline = proc.cmdline
pusername = proc.username
except psutil.NoSuchProcess: except psutil.NoSuchProcess:
continue continue
if pinfo['username'] != username: if pusername != username:
continue continue
if pinfo['name'] != 'ssh': if pname != 'ssh':
continue continue
for cp_file in cp_files: 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) ssh_cm_procs.append(proc)
break break