summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Havela <mika.havela@gmail.com>2008-02-01 13:53:42 +0000
committerMika Havela <mika.havela@gmail.com>2008-02-01 13:53:42 +0000
commitd03f5137947aaaeb516491445c1724cb543465ff (patch)
tree9864e7f454b41c57d583dc6d1cbbb00bdec67ede
parent1889fca8b509381c749d7e418e92cf809ec8d5ce (diff)
downloadacf-alpine-baselayout-d03f5137947aaaeb516491445c1724cb543465ff.tar.bz2
acf-alpine-baselayout-d03f5137947aaaeb516491445c1724cb543465ff.tar.xz
Added [true|fales] when some public functions returns back status
git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@677 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--syslog-controller.lua8
-rw-r--r--syslog-expert-html.lsp2
-rw-r--r--syslog-model.lua4
3 files changed, 8 insertions, 6 deletions
diff --git a/syslog-controller.lua b/syslog-controller.lua
index 4fe7755..de5195f 100644
--- a/syslog-controller.lua
+++ b/syslog-controller.lua
@@ -65,7 +65,7 @@ function status(self)
end
function config(self)
- local cmdmanagement
+ local cmdmanagement, cmdmanagementresult
local cmdsavereply = {}
local cmdsaveresult = {}
if ( self.clientdata.cmdmanagement) then
@@ -73,7 +73,7 @@ function config(self)
name="cmdmanagement",
value=string.lower(self.clientdata.cmdmanagement),
})
- cmdmanagement = self.model:startstop_service( cmdmanagement )
+ cmdmanagementresult, cmdmanagement = self.model:startstop_service( cmdmanagement )
end
if ( self.clientdata.cmdsave) then
local variables="logfile loglevel smallerlogs maxsize numrotate localandnetworklog remotelogging" -- Advanced-config options
@@ -132,13 +132,13 @@ function config(self)
end
function expert(self)
- local cmdmanagement
+ local cmdmanagement, cmdmanagementresult
if ( self.clientdata.cmdmanagement) then
cmdmanagement = cfe({
name="cmdmanagement",
value=string.lower(self.clientdata.cmdmanagement),
})
- cmdmanagement = self.model:startstop_service( cmdmanagement )
+ cmdmanagementresult, cmdmanagement = self.model:startstop_service( cmdmanagement )
end
-- Save changes
diff --git a/syslog-expert-html.lsp b/syslog-expert-html.lsp
index 5907a7a..0a36abb 100644
--- a/syslog-expert-html.lsp
+++ b/syslog-expert-html.lsp
@@ -105,7 +105,7 @@ if (cmdform) and (cmdform[tags[1]]) then
<? end ?>
<?
----[[ DEBUG INFORMATION
+--[[ DEBUG INFORMATION
io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>")
io.write(html.cfe_unpack(form))
io.write("</span>")
diff --git a/syslog-model.lua b/syslog-model.lua
index e9e03d5..1af9dd3 100644
--- a/syslog-model.lua
+++ b/syslog-model.lua
@@ -34,7 +34,8 @@ function startstop_service ( self, action )
local cmdresult,cmdmessage,cmderror,cmdaction = daemoncontrol.daemoncontrol("syslog", cmd)
action.descr=cmdmessage
action.errtxt=cmderror
- return action
+ -- Reporting back (true|false, the original acition)
+ return cmdresult,action
end
@@ -61,6 +62,7 @@ function getstatus()
value=opts["SYSLOGD_OPTS"]["-R"],
})
end
+
return status
end