summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2008-10-30 14:51:41 +0000
committerTed Trask <ttrask01@yahoo.com>2008-10-30 14:51:41 +0000
commit002ca9e67f49b3f425ac583570ac5b95d782014b (patch)
treed73efe4ef365f0c0cd2ef24808d90d2f1d906b67
parentace4f4934cb4610c287bd240318ea9db12ecdf89 (diff)
downloadacf-alpine-baselayout-002ca9e67f49b3f425ac583570ac5b95d782014b.tar.bz2
acf-alpine-baselayout-002ca9e67f49b3f425ac583570ac5b95d782014b.tar.xz
Modified syslog status to also report startup.
git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@1567 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--syslog-controller.lua4
-rw-r--r--syslog-model.lua18
2 files changed, 3 insertions, 19 deletions
diff --git a/syslog-controller.lua b/syslog-controller.lua
index 5bd65c4..bc4fa87 100644
--- a/syslog-controller.lua
+++ b/syslog-controller.lua
@@ -20,7 +20,5 @@ function startstop(self)
end
function status(self)
- status = self.model.getstatus()
- version = self.model.getversion()
- return cfe({ type="group", value={status=status, version=version} })
+ return self.model.getstatus()
end
diff --git a/syslog-model.lua b/syslog-model.lua
index 380b300..38920b3 100644
--- a/syslog-model.lua
+++ b/syslog-model.lua
@@ -7,16 +7,9 @@ require("validator")
local configfile = "/etc/conf.d/syslog"
local processinitname = "syslog"
+local packagename = "busybox"
local processname = "syslogd"
-local function get_version()
- local cmd = "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin apk_version -v -s busybox | cut -d ' ' -f 1"
- local cmd_output = io.popen( cmd )
- local cmd_output_result = cmd_output:read("*a") or ""
- cmd_output:close()
- return cmd_output_result
-end
-
local function getloglevels()
local loglevels = {}
for i=1,8 do
@@ -157,15 +150,8 @@ function startstop_service(action)
return modelfunctions.startstop_service(processinitname, action)
end
-function getversion()
- return cfe({
- label="Program version",
- value=get_version(),
- })
-end
-
function getstatus()
- return modelfunctions.getenabled(processname)
+ return modelfunctions.getstatus(processname, packagename, "Syslog Status", processinitname)
end
function getlogging()