greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix python trying to use default getattr using psutil 0.5.1. 

Don't know why adding "None" as second default helps.
pull/336/head
Markus Roth 2014-03-17 21:57:22 +01:00
parent 49ba692154
commit 209b48025a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glances/glances.py
View File

@ -1247,15 +1247,15 @@ class GlancesGrabProcesses:
# Process memory
procstat['memory_info'] = getattr(proc, 'get_memory_info',
getattr(proc, 'memory_info'))()
getattr(proc, 'memory_info', None))()
procstat['memory_percent'] = getattr(proc, 'get_memory_percent',
getattr(proc, 'memory_percent'))()
getattr(proc, 'memory_percent', None))()
# Process CPU
procstat['cpu_times'] = getattr(proc, 'get_cpu_times',
getattr(proc, 'cpu_times'))()
getattr(proc, 'cpu_times', None))()
procstat['cpu_percent'] = getattr(proc, 'get_cpu_percent',
getattr(proc, 'cpu_percent'))(interval=0)
getattr(proc, 'cpu_percent', None))(interval=0)
# Process network connections (TCP and UDP) (Experimental)
# !!! High CPU consumption
@ -1275,7 +1275,7 @@ class GlancesGrabProcesses:
try:
# Get the process IO counters
proc_io = getattr(proc, 'get_io_counters',
getattr(proc, 'io_counters'))()
getattr(proc, 'io_counters', None))()
io_new = [proc_io.read_bytes, proc_io.write_bytes]
except psutil.AccessDenied:
# Access denied to process IO (no root account)