From 6b61df3b73f5ff26f1d85c48c2b13e4c71738946 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Sat, 21 Sep 2013 19:00:01 +0200
Subject: Implemented cWebAdmin:GetMemoryUsage() on Linux proper.

Also the function now returns an int, number of KiB used, or -1 on failure.
---
 MCServer/webadmin/template.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'MCServer')

diff --git a/MCServer/webadmin/template.lua b/MCServer/webadmin/template.lua
index 1ab1aab88..c9fdf7148 100644
--- a/MCServer/webadmin/template.lua
+++ b/MCServer/webadmin/template.lua
@@ -58,7 +58,7 @@ function ShowPage(WebAdmin, TemplateRequest)
 	SiteContent = {}
 	local BaseURL = WebAdmin:GetBaseURL(TemplateRequest.Request.Path)
 	local Title = "MCServer"
-	local MemoryUsage = cWebAdmin:GetMemoryUsage()
+	local MemoryUsageKiB = cWebAdmin:GetMemoryUsage()
 	local NumChunks = cRoot:Get():GetTotalChunkCount()
 	local PluginPage = WebAdmin:GetPage(TemplateRequest.Request)
 	local PageContent = PluginPage.Content
@@ -456,7 +456,7 @@ function ShowPage(WebAdmin, TemplateRequest)
 		</div>	
 		<!-- // #containerHolder -->
 	    
-		<p id="footer">MCServer is using: ]] .. MemoryUsage .. [[MB of memory; Current chunk count: ]] .. NumChunks .. [[ </p>
+		<p id="footer">MCServer is using: ]] .. MemoryUsageKiB / 1024 .. [[ MiB of memory; Current chunk count: ]] .. NumChunks .. [[ </p>
 	</div>
 	<!-- // #wrapper -->
 </body>
-- 
cgit v1.2.3