diff options
| author | Mika Havela <mika.havela@gmail.com> | 2008-01-24 15:21:02 +0000 |
|---|---|---|
| committer | Mika Havela <mika.havela@gmail.com> | 2008-01-24 15:21:02 +0000 |
| commit | 4aaf7226430f480eb75e3653958d2f1f448fc186 (patch) | |
| tree | 68a46fb7588679bb3cf1c246022d402fd25c74dc /syslog-controller.lua | |
| parent | e482873743f419da21266605deffbb9b6daffb4f (diff) | |
| download | acf-alpine-baselayout-4aaf7226430f480eb75e3653958d2f1f448fc186.tar.bz2 acf-alpine-baselayout-4aaf7226430f480eb75e3653958d2f1f448fc186.tar.xz | |
Expert-tab works.
Statuspage works.
Configpage shows current settings, but saving changes doesnt work (work in progress).
git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@640 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'syslog-controller.lua')
| -rw-r--r-- | syslog-controller.lua | 44 |
1 files changed, 31 insertions, 13 deletions
diff --git a/syslog-controller.lua b/syslog-controller.lua index 0bdc2f5..288ae7b 100644 --- a/syslog-controller.lua +++ b/syslog-controller.lua @@ -10,22 +10,40 @@ function status(self) end function config(self) - local srvcmdresult = nil - local srvcmd = self.clientdata.srvcmd - if (srvcmd ~= nil) then - srvcmdresult = self.model:service_control(srvcmd) - if (srvcmd == "stop") or (srvcmd == "restart") then - posix.sleep(3) -- Wait for the process to start|stop - else - posix.sleep(1) -- Wait for the process to start|stop - end - end - - return { status = self.model.getstatus(), srvcmdresult=srvcmdresult, config= self.model.getconfig() } +-- local srvcmdresult = nil +-- local srvcmd = self.clientdata.srvcmd +-- if (srvcmd ~= nil) then +-- srvcmdresult = self.model:service_control(srvcmd) +-- if (srvcmd == "stop") or (srvcmd == "restart") then +-- posix.sleep(3) -- Wait for the process to start|stop +-- else +-- posix.sleep(1) -- Wait for the process to start|stop +-- end +-- end + local status = self.model.getstatus() + local config, errors = self.model.getconfig() + local url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller + + return { + status = status, +-- srvcmdresult = srvcmdresult, + config = config, + errors = errors, + url = url, } end function expert(self) - return { file = self.model:get_filedetails(), status = self.model.getstatus(),} + local modifications = self.clientdata.modifications or "" + if ( modifications ~= "") then + modifications = self.model:update_filecontent(modifications) + end + + local status = self.model.getstatus() + local url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller + + return { file = self.model:get_filedetails(), + status = status, + url = url, } end |