1 files changed, 36 insertions, 26 deletions
diff --git a/squid-model.lua b/squid-model.lua
index 11dc7d0..e2b9285 100644
--- a/squid-model.lua
+++ b/squid-model.lua
@@ -2,10 +2,16 @@
 -- Copyright(c) 2007 A. Brodmann - Licensed under terms of GPL2
 module (..., package.seeall)
 
-require "format"
+-- Load libraries
+require("format")
+require("processinfo")
+require("procps")
 
-squidconf = "/etc/squid/squid.conf"
-squidtempl = "/etc/squid/squid.conf.template"
+-- Set variables
+local squidconf = "/etc/squid/squid.conf"
+local squidtempl = "/etc/squid/squid.conf.template"
+local processname = "squid"
+local packagename = "squid"
 
 --- the tokenizer functions - must be dislocated into a library later
 tokenizer = {}
@@ -50,33 +56,37 @@ end
 ---
 
 get_status = function()
-
-	local retval = "stopped"
-
-	local ptr = io.popen( "/bin/pidof squid" )
-	local pid = ptr:read( "*a" )
-	ptr:close()
-	if pid ~= nil then
-		if #pid > 1 then
-			retval = "running"
-		end
+	local t = procps.pidof(procname)
+	local stats
+	if (t) and (#t > 0) then
+		stats = "Enabled"
+	else
+		stats = "Disabled"
 	end
-	
+	local retval = cfe({ name="status",
+		label="Program status",
+		value=stats,
+		})
 	return retval
 end
 
 get_squid_version = function()
+	local value, errtxt = processinfo.package_version(packagename)
+	local retval = cfe({ name = "version",
+		label="Program version",
+		value=value,
+		errtxt=errtxt,
+		 })
+	return retval
+end
 
-	local retval = ""
-	
-	local ptr = io.popen( "/usr/sbin/squid -v" )
-	if ptr ~= nil then
-		retval = ptr:read( "*l" )
-		ptr:close()
-	else
-		retval = "Error - can't retrieve squid version"
-	end
-	
+get_autostart = function()
+	local autostart_sequense, autostart_errtxt = processinfo.process_botsequence(processname)
+	local retval = cfe({ name="autostart",
+		label="Autostart sequence",
+		value=autostart_sequense,
+		errtxt=autostart_errtxt,
+		})
 	return retval
 end
 
@@ -97,14 +107,14 @@ end
 
 get_status_winbindd = function()
 
-	local retval = "stopped"
+	local retval = "Disabled"
 
 	local ptr = io.popen( "/bin/pidof winbindd" )
 	local pid = ptr:read( "*a" )
 	ptr:close()
 	if pid ~= nil then
 		if #pid > 1 then
-			retval = "running"
+			retval = "Enabled"
 		end
 	end