nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-11-10 01:26:15 +03:00
Code Issues Projects Releases Wiki Activity

RC3 - Correct bug with process extended stats on Mac OS

Browse Source
This commit is contained in:
Nicolargo 2014-08-25 14:46:48 +02:00
parent 2f1a4576b3
commit 630b14ac45
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glances/__init__.py
View File

@ -20,7 +20,7 @@
"""Init the Glances software."""
__appname__ = 'glances'
__version__ = '2.1_RC2'
__version__ = '2.1_RC3'
__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
__license__ = 'LGPL'

8
glances/plugins/glances_processlist.py
View File

@ -114,7 +114,7 @@ class Plugin(GlancesPlugin):
for p in self.sortlist(process_sort_key):
ret.append(self.curse_new_line())
# CPU
if 'cpu_percent' in p:
if 'cpu_percent' in p and p['cpu_percent'] is not None and p['cpu_percent'] != '':
msg = '{0:>6.1f}'.format(p['cpu_percent'])
ret.append(self.curse_add_line(msg,
self.get_alert(p['cpu_percent'], header="cpu")))
@ -122,7 +122,7 @@ class Plugin(GlancesPlugin):
msg = '{0:>6}'.format('?')
ret.append(self.curse_add_line(msg))
# MEM
if 'memory_percent' in p:
if 'memory_percent' in p and p['memory_percent'] is not None and p['memory_percent'] != '':
msg = '{0:>6.1f}'.format(p['memory_percent'])
ret.append(self.curse_add_line(msg,
self.get_alert(p['memory_percent'], header="mem")))
@ -130,7 +130,7 @@ class Plugin(GlancesPlugin):
msg = '{0:>6}'.format('?')
ret.append(self.curse_add_line(msg))
# VMS/RSS
if 'memory_info' in p:
if 'memory_info' in p and p['memory_info'] is not None and p['memory_info'] != '':
# VMS
msg = '{0:>6}'.format(self.auto_unit(p['memory_info'][1], low_precision=False))
ret.append(self.curse_add_line(msg, optional=True))
@ -257,7 +257,7 @@ class Plugin(GlancesPlugin):
# Ignore rss and vms (already displayed)
if k not in ['rss', 'vms'] and v is not None:
msg += k + ' ' + self.auto_unit(v, low_precision=False) + ' '
if p['memory_swap'] is not None:
if 'memory_swap' in p and p['memory_swap'] is not None:
msg += _('swap ') + self.auto_unit(p['memory_swap'], low_precision=False)
ret.append(self.curse_add_line(msg))
# Third line is for openned files/network sessions