diff options
| author | Mika Havela <mika.havela@gmail.com> | 2008-04-17 08:57:08 +0000 |
|---|---|---|
| committer | Mika Havela <mika.havela@gmail.com> | 2008-04-17 08:57:08 +0000 |
| commit | 0decbc0ab98c1b580d775f86c5985f882c94ee17 (patch) | |
| tree | 2b883abef7ed14b95372871c0000861e02e3adee | |
| parent | e6a3d004067522289bf52d96b0a398cf539e7b80 (diff) | |
| download | acf-shorewall-0decbc0ab98c1b580d775f86c5985f882c94ee17.tar.bz2 acf-shorewall-0decbc0ab98c1b580d775f86c5985f882c94ee17.tar.xz | |
Fetching path to logfile by reading the configfile instead of hardcode /var/log/messages
git-svn-id: svn://svn.alpinelinux.org/acf/shorewall/trunk@1027 ab2d0c66-481e-0410-8bed-d214d4d58bed
| -rw-r--r-- | shorewall-model.lua | 3 | ||||
| -rw-r--r-- | shorewall-status-html.lsp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/shorewall-model.lua b/shorewall-model.lua index 4acb9da..9a660a6 100644 --- a/shorewall-model.lua +++ b/shorewall-model.lua @@ -307,7 +307,8 @@ end function getlogfile () local logfile = {} - local cmdaction = "grep Shorewall /var/log/messages" + local logfilepath = getopts.getoptsfromfile(configfile,"LOGFILE") + local cmdaction = "grep Shorewall " .. logfilepath.LOGFILE local f, error = io.popen(cmdaction ,r) local checkresult = f:read("*a") f:close() diff --git a/shorewall-status-html.lsp b/shorewall-status-html.lsp index 7055966..9122797 100644 --- a/shorewall-status-html.lsp +++ b/shorewall-status-html.lsp @@ -4,7 +4,7 @@ require("viewfunctions") <? --[[ DEBUG INFORMATION io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>") -io.write(html.cfe_unpack(view)) +io.write(html.cfe_unpack(form)) io.write("</span>") --]] ?> |