From 4f54a99126e25b88258c0a31cea66d7259a6fede Mon Sep 17 00:00:00 2001 From: Mika Havela Date: Fri, 4 Apr 2008 11:14:41 +0000 Subject: Adding show-logfile functionallity. git-svn-id: svn://svn.alpinelinux.org/acf/ipsec-tools/trunk@912 ab2d0c66-481e-0410-8bed-d214d4d58bed --- Makefile | 1 + ipsectools-controller.lua | 12 +++++++ ipsectools-logfile-html.lsp | 78 +++++++++++++++++++++++++++++++++++++++++++++ ipsectools-model.lua | 22 +++++++++++++ ipsectools.menu | 1 + 5 files changed, 114 insertions(+) create mode 100644 ipsectools-logfile-html.lsp diff --git a/Makefile b/Makefile index 4226acc..de856cc 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ APP_DIST=\ ipsectools-model.lua \ ipsectools-status-html.lsp \ ipsectools-expert-html.lsp \ + ipsectools-logfile-html.lsp \ ipsectools.menu \ diff --git a/ipsectools-controller.lua b/ipsectools-controller.lua index 1689b36..6d3fb3c 100644 --- a/ipsectools-controller.lua +++ b/ipsectools-controller.lua @@ -122,3 +122,15 @@ expert = function (self) cmdmanagement = cmdmanagement, url = url, } ) end + +logfile = function (self) + + local status=self.model.getstatus() + local logfile = self.model:get_logfile() + + return ({ + status = status, + logfile = logfile, + url = url, + }) +end diff --git a/ipsectools-logfile-html.lsp b/ipsectools-logfile-html.lsp new file mode 100644 index 0000000..6f8f8f7 --- /dev/null +++ b/ipsectools-logfile-html.lsp @@ -0,0 +1,78 @@ + + +DEBUGGING

DEBUG INFO: CFE

") +io.write(html.cfe_unpack(form)) +io.write("
") +--]] +?> + 0) then + val.class = "error" + io.write(" class='error'") + end + io.write(">" .. val.label .. "") + io.write("\n\t\t
") + if (viewtype == "viewonly") then + io.write(val.value) + elseif (val.type == "radio") and (type(val.option) == "table") and (#val.option > 0) then + io.write("") + for k1,v1 in pairs(val.option) do + io.write(tostring(v1.label) .. ":") + io.write("") + end + io.write("") + else + io.write(html.form[val.type](val)) + end + if (val.descr) and (#val.descr > 0) then io.write("\n\t\t

" .. string.gsub(val.descr, "\n", "
") .. "

") end + if (#val.errtxt > 0) then io.write("\n\t\t

" .. string.gsub(val.errtxt, "\n", "
") .. "

") end + io.write("\n\t\t
\n") + end + end +end +?> + +

SYSTEM INFO

+
+ +
+ + + +
+

LOGFILE

+

Details

+
+ +
+ +

FILE CONTENT

+ + +
+ +DEBUGGING

DEBUG INFO: CFE

") +io.write(html.cfe_unpack(form)) +io.write("
") +--]] +?> diff --git a/ipsectools-model.lua b/ipsectools-model.lua index 6eed873..4b91fdf 100644 --- a/ipsectools-model.lua +++ b/ipsectools-model.lua @@ -255,3 +255,25 @@ function update_filecontent2 (self, modifications) local file_result,err = fs.write_file(path, format.dostounix(modifications)) return file_result end +function get_logfile () + local file = {} + local cmdtxt = "cat /var/log/messages | grep " .. processname + local cmd, error = io.popen(cmdtxt ,r) + local cmdoutput = cmd:read("*a") + cmd:close() + + file["filename"] = cfe({ + name="filename", + label="File name", + value=cmdtxt, + }) + + file["filecontent"] = cfe({ + type="longtext", + name="filecontent", + label="File content", + value=cmdoutput, + }) + + return file +end diff --git a/ipsectools.menu b/ipsectools.menu index b46dfdd..b194bec 100644 --- a/ipsectools.menu +++ b/ipsectools.menu @@ -1,4 +1,5 @@ #CAT GROUP/DESC TAB ACTION Networking 45IPsec Status status Networking 45IPsec Expert expert +Networking 45IPsec Logfile logfile -- cgit v1.2.3