mirror/glances
1
0
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2026-03-17 05:16:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge issue

Browse Source
This commit is contained in:
Nicolargo
2015-01-24 16:30:20 +01:00
parent 7feffee8e3
commit b6b5230dcd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
glances/plugins/glances_load.py
View File

@@ -121,12 +121,15 @@ class Plugin(GlancesPlugin):
# Call the father's method
GlancesPlugin.update_views(self)
if self.views != {}:
# Add specifics informations
# Add specifics informations
try:
# Alert and log
self.views['min15']['decoration'] = self.get_alert_log(self.stats['min15'], max=100 * self.stats['cpucore'])
# Alert only
self.views['min5']['decoration'] = self.get_alert(self.stats['min5'], max=100 * self.stats['cpucore'])
except KeyError:
# try/except mandatory for Windows compatibility (no load stats)
pass
def msg_curse(self, args=None):
"""Return the dict to display in the curse interface."""