Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-mod-status: fix free swap calculation

Browse source 
Fixes: #3295
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-11-14 09:30:16 +01:00
parent a07d0b4824
commit 80c9b6fee0
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/20_memory.js
View file

@ -31,24 +31,24 @@ return L.Class.extend({
swap = L.isObject(systeminfo.swap) ? systeminfo.swap : {}; swap = L.isObject(systeminfo.swap) ? systeminfo.swap : {};
var fields = [ var fields = [
_('Total Available'), (mem.available) ? mem.available : (mem.total && mem.free && mem.buffered) ? mem.free + mem.buffered : null, _('Total Available'), (mem.available) ? mem.available : (mem.total && mem.free && mem.buffered) ? mem.free + mem.buffered : null, mem.total,
_('Free'), (mem.total && mem.free) ? mem.free : null, _('Free'), (mem.total && mem.free) ? mem.free : null, mem.total,
_('Buffered'), (mem.total && mem.buffered) ? mem.buffered : null _('Buffered'), (mem.total && mem.buffered) ? mem.buffered : null, mem.total
]; ];
if (mem.cached) if (mem.cached)
fields.push(_('Cached'), mem.cached); fields.push(_('Cached'), mem.cached, mem.total);
if (swap.total > 0) if (swap.total > 0)
fields.push(_('Swap free'), swap.free); fields.push(_('Swap free'), swap.free, swap.total);
var table = E('div', { 'class': 'table' }); var table = E('div', { 'class': 'table' });
for (var i = 0; i < fields.length; i += 2) { for (var i = 0; i < fields.length; i += 3) {
table.appendChild(E('div', { 'class': 'tr' }, [ table.appendChild(E('div', { 'class': 'tr' }, [
E('div', { 'class': 'td left', 'width': '33%' }, [ fields[i] ]), E('div', { 'class': 'td left', 'width': '33%' }, [ fields[i] ]),
E('div', { 'class': 'td left' }, [ E('div', { 'class': 'td left' }, [
(fields[i + 1] != null) ? progressbar(fields[i + 1], mem.total, true) : '?' (fields[i + 1] != null) ? progressbar(fields[i + 1], fields[i + 2], true) : '?'
]) ])
])); ]));
} }