From 0b0d068ccb91f25f48099ff4d346eac2c387f86e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Wed, 2 Mar 2011 13:28:33 +0200
Subject: health: fix memory info

Parse /proc/meminfo instead of 'free' output which changed in
busybox and caused breakage. Display also Buffers.
---
 health-system-html.lsp | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

(limited to 'health-system-html.lsp')

diff --git a/health-system-html.lsp b/health-system-html.lsp
index f2e4d6c..f25bf8b 100644
--- a/health-system-html.lsp
+++ b/health-system-html.lsp
@@ -23,14 +23,42 @@
 <DL>
 <pre><%= html.html_escape(view.value.memory.value) %></pre>
 
+<%
+local function print_percent(val)
+	if (tonumber(val) > 10) then
+		io.write(html.html_escape(val) .. "%")
+	end
+end
+%>
+
 <TABLE STYLE="margin:0px;padding:0px;border:0px">
 	<TR>
-		<TD>0%</TD><TD WIDTH="<%= html.html_escape(view.value.memory.used) %>%" STYLE="background:red;border:2px solid black;border-right:none;"><CENTER><B><% if ( tonumber(view.value.memory.used) > 10) then io.write(html.html_escape(view.value.memory.used) .. "%") end %></B></CENTER></TD><TD WIDTH="<%= (100-tonumber(view.value.memory.used)) %>%" STYLE="background:#0c0;border:2px solid black;border-left:none;""><CENTER><B><% if ( 90 > tonumber(view.value.memory.used)) then io.write((100-tonumber(view.value.memory.used)) .. "%") end %></B></CENTER></TD><TD>100%</TD>
+		<TD>0%</TD>
+		<TD WIDTH="<%= html.html_escape(view.value.memory.used) %>%"
+		    STYLE="background:red;border:2px solid black;border-right:none;">
+			<CENTER><B><% print_percent(view.value.memory.used) %></B></CENTER>
+		</TD>
+		<TD WIDTH="<%= html.html_escape(view.value.memory.buffers) %>%"
+		    STYLE="background:yellow;border:2px solid black;">
+			<CENTER><B><% print_percent(view.value.memory.buffers) %></B></CENTER>
+		</TD>
+		<TD WIDTH="<%= tonumber(view.value.memory.free) %>%"
+		    STYLE="background:#0c0;border:2px solid black;border-left:none;"">
+			<CENTER><B><% print_percent(view.value.memory.free) %></B></CENTER>
+		</TD>
+		<TD>100%</TD>
 	</TR>
 </TABLE>
+
 <TABLE STYLE="margin:0px;padding:0px;border:0px;margin-top:5px;">
 	<TR>
-		<TD WIDTH="100px"><B>Total:</B></TD><TD STYLE="background:red;;border:2px solid black;" WIDTH="20px"></TD><TD WIDTH="70px"><B>=Used</B></TD><TD STYLE="background:#0c0;border:2px solid black;" WIDTH="20px"></TD><TD><B>=Free</B></TD>
+		<TD WIDTH="100px"><B>Legend:</B></TD>
+		<TD STYLE="background:red;;border:2px solid black;" WIDTH="20px"></TD>
+		<TD WIDTH="70px"><B>=Used</B></TD>
+		<TD STYLE="background:yellow;;border:2px solid black;" WIDTH="20px"></TD>
+		<TD WIDTH="70px"><B>=Buffers</B></TD>
+		<TD STYLE="background:#0c0;border:2px solid black;" WIDTH="20px"></TD>
+		<TD><B>=Free</B></TD>
 	</TR>
 </TABLE>
 </DL>
-- 
cgit v1.2.3