nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-12-01 22:14:06 +03:00
Code Issues Projects Releases Wiki Activity

Correct issue on the Web server mode

Browse Source
This commit is contained in:
Nicolargo 2014-05-24 14:54:22 +02:00
parent d4ea4867d8
commit 887921b2e2
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glances/outputs/glances_bottle.py
View File

@ -65,7 +65,10 @@ class glancesBottle:
'OK_LOG': 'ok_log',
'CAREFUL_LOG': 'careful_log',
'WARNING_LOG': 'warning_log',
'CRITICAL_LOG': 'critical_log'
'CRITICAL_LOG': 'critical_log',
'STATUS': '',
'NICE': '',
'PROCESS': ''
}
def _route(self):
@ -178,12 +181,15 @@ class glancesBottle:
tpl += '</div>'
tpl += '<div class="row">'
continue
# Do not display splittable
if m['splittable']:
tpl += '<span></span>'
continue
tpl += '<span class="cell" id="%s">%s</span>' % \
(self.__style_list[m['decoration']], m['msg'].replace(' ', '&nbsp;'))
if plugin_name == 'processlist' and m['splittable']:
# Display first word of splittable stats (Process name)
tpl += '<span class="cell" id="%s">%s</span>' % \
(self.__style_list[m['decoration']],
m['msg'].split(' ', 1)[0].replace(' ', '&nbsp;'))
else:
# Display stat
tpl += '<span class="cell" id="%s">%s</span>' % \
(self.__style_list[m['decoration']], m['msg'].replace(' ', '&nbsp;'))
tpl += '</div>'
tpl += '</div>'

16
glances/plugins/glances_mem.py
View File

@ -152,47 +152,47 @@ class Plugin(GlancesPlugin):
ret.append(self.curse_add_line(msg))
# Active memory usage
if 'active' in self.stats:
msg = " {0:8}".format(_("active:"))
msg = " {0:8}".format(_("active")[0:7]+':')
ret.append(self.curse_add_line(msg, optional=True))
msg = "{0:>7}".format(self.auto_unit(self.stats['active']))
ret.append(self.curse_add_line(msg, optional=True))
# New line
ret.append(self.curse_new_line())
# Total memory usage
msg = "{0:6}".format(_("total:"))
msg = "{0:6}".format(_("total")[0:5]+':')
ret.append(self.curse_add_line(msg))
msg = "{0:>7}".format(self.auto_unit(self.stats['total']))
ret.append(self.curse_add_line(msg))
# Inactive memory usage
if 'inactive' in self.stats:
msg = " {0:9}".format(_("inactive:"))
msg = " {0:8}".format(_("inactive")[0:7]+':')
ret.append(self.curse_add_line(msg, optional=True))
msg = "{0:>6}".format(self.auto_unit(self.stats['inactive']))
msg = "{0:>7}".format(self.auto_unit(self.stats['inactive']))
ret.append(self.curse_add_line(msg, optional=True))
# New line
ret.append(self.curse_new_line())
# Used memory usage
msg = "{0:6}".format(_("used:"))
msg = "{0:6}".format(_("used")[0:5]+':')
ret.append(self.curse_add_line(msg))
msg = "{0:>7}".format(self.auto_unit(self.stats['used']))
ret.append(self.curse_add_line(
msg, self.get_alert_log(self.stats['used'], max=self.stats['total'])))
# Buffers memory usage
if 'buffers' in self.stats:
msg = " {0:8}".format(_("buffers:"))
msg = " {0:8}".format(_("buffers")[0:7]+':')
ret.append(self.curse_add_line(msg, optional=True))
msg = "{0:>7}".format(self.auto_unit(self.stats['buffers']))
ret.append(self.curse_add_line(msg, optional=True))
# New line
ret.append(self.curse_new_line())
# Free memory usage
msg = "{0:6}".format(_("free:"))
msg = "{0:6}".format(_("free")[0:5]+':')
ret.append(self.curse_add_line(msg))
msg = "{0:>7}".format(self.auto_unit(self.stats['free']))
ret.append(self.curse_add_line(msg))
# Cached memory usage
if 'cached' in self.stats:
msg = " {0:8}".format(_("cached:"))
msg = " {0:8}".format(_("cached")[0:7]+':')
ret.append(self.curse_add_line(msg, optional=True))
msg = "{0:>7}".format(self.auto_unit(self.stats['cached']))
ret.append(self.curse_add_line(msg, optional=True))