From 59f9c1eb6d6cb07b5b52e5a77936d3b7d9ccfe32 Mon Sep 17 00:00:00 2001 From: Mika Havela Date: Fri, 4 Apr 2008 11:16:05 +0000 Subject: Adding show-logfile functionallity. git-svn-id: svn://svn.alpinelinux.org/acf/opennhrp/trunk@913 ab2d0c66-481e-0410-8bed-d214d4d58bed --- opennhrp-controller.lua | 11 +++++++ opennhrp-logfile-html.lsp | 78 +++++++++++++++++++++++++++++++++++++++++++++++ opennhrp-model.lua | 22 +++++++++++++ opennhrp.menu | 1 + 4 files changed, 112 insertions(+) create mode 100644 opennhrp-logfile-html.lsp diff --git a/opennhrp-controller.lua b/opennhrp-controller.lua index f59ac0a..ac216e7 100644 --- a/opennhrp-controller.lua +++ b/opennhrp-controller.lua @@ -107,3 +107,14 @@ 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/opennhrp-logfile-html.lsp b/opennhrp-logfile-html.lsp new file mode 100644 index 0000000..6f8f8f7 --- /dev/null +++ b/opennhrp-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/opennhrp-model.lua b/opennhrp-model.lua index ae5531e..6b3b0ae 100644 --- a/opennhrp-model.lua +++ b/opennhrp-model.lua @@ -185,3 +185,25 @@ function update_filecontent (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/opennhrp.menu b/opennhrp.menu index c836a24..cf458c4 100644 --- a/opennhrp.menu +++ b/opennhrp.menu @@ -1,4 +1,5 @@ #CAT GROUP/DESC TAB ACTION Networking 45NHRP Status status Networking 45NHRP Expert expert +Networking 45NHRP Logfile logfile -- cgit v1.2.3