diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2015-10-30 14:27:10 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2015-10-30 14:27:10 +0000 |
| commit | 5c323f4b65c1c3276af8ab6aa8a3a57d3d6bc795 (patch) | |
| tree | 0468f01c79d5ddc0cb6f2011b42378cb6209ae9a | |
| parent | 5aea5b9f76d8222b22f76e5a7b5378fd14885fb6 (diff) | |
| download | acf-gross-5c323f4b65c1c3276af8ab6aa8a3a57d3d6bc795.tar.bz2 acf-gross-5c323f4b65c1c3276af8ab6aa8a3a57d3d6bc795.tar.xz | |
Modify logfile to get logging info from the config and use common view
| -rw-r--r-- | gross-controller.lua | 4 | ||||
| l---------[-rw-r--r--] | gross-logfile-html.lsp | 7 | ||||
| -rw-r--r-- | gross-model.lua | 7 |
3 files changed, 12 insertions, 6 deletions
diff --git a/gross-controller.lua b/gross-controller.lua index 916511e..ee54de9 100644 --- a/gross-controller.lua +++ b/gross-controller.lua @@ -18,4 +18,8 @@ function mymodule.expert(self) return self.handle_form(self, self.model.get_filedetails, self.model.update_filedetails, self.clientdata, "Save", "Edit Gross Config", "Configuration Set") end +function mymodule.logfile(self) + return self.model.get_logfile(self, self.clientdata) +end + return mymodule diff --git a/gross-logfile-html.lsp b/gross-logfile-html.lsp index 24cad72..ac8854f 100644..120000 --- a/gross-logfile-html.lsp +++ b/gross-logfile-html.lsp @@ -1,6 +1 @@ -<% local data, viewlibrary = ... -%> - -<% if viewlibrary and viewlibrary.dispatch_component then - viewlibrary.dispatch_component("alpine-baselayout/logfiles/view", {filename="/var/log/messages", grep="gross"}) -end %> +../logfile-html.lsp
\ No newline at end of file diff --git a/gross-model.lua b/gross-model.lua index 94a2685..e3d5241 100644 --- a/gross-model.lua +++ b/gross-model.lua @@ -42,4 +42,11 @@ function mymodule.update_filedetails(self, filedetails) return modelfunctions.setfiledetails(self, filedetails, {configfile}) end +function mymodule.get_logfile(self, clientdata) + local retval = cfe({ type="group", value={}, label="Log File Configuration" }) + retval.value.facility = cfe({value=format.parse_ini_file(fs.read_file(configfile), "", "syslog_facility") or "mail", label="Syslog Facility"}) + retval.value.grep = cfe({ value="gross", label="Grep" }) + return retval +end + return mymodule |