diff options
author | Ted Trask <ttrask01@yahoo.com> | 2009-03-17 20:39:56 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2009-03-17 20:39:56 +0000 |
commit | 74333b3e14e3843217c76c421caad364858e05b3 (patch) | |
tree | 703b08cf70360c1e88a77c6927bdcc94e15852f1 | |
parent | fe287bf83c0d63369df3a5297a505fa1794a0a4a (diff) | |
download | acf-postgresql-74333b3e14e3843217c76c421caad364858e05b3.tar.bz2 acf-postgresql-74333b3e14e3843217c76c421caad364858e05b3.tar.xz |
Changed the way startstop works in core to add a list of allowed actions. Modified all ACFs that don't use the standard functions to work with new library method.
git-svn-id: svn://svn.alpinelinux.org/acf/postgresql/trunk@1730 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r-- | postgresql-model.lua | 16 | ||||
-rw-r--r-- | postgresql-startstop-html.lsp | 19 |
2 files changed, 10 insertions, 25 deletions
diff --git a/postgresql-model.lua b/postgresql-model.lua index 5ea63a0..2479796 100644 --- a/postgresql-model.lua +++ b/postgresql-model.lua @@ -22,21 +22,7 @@ local filelist = fs.find_files_as_array(".*\.conf", datadirectory) -- PUBLIC FUNCTIONS function startstop_service(action) - -- Custom startstop to enable setup option - local result = cfe({ label="Start/Stop result" }) - - if (string.lower(action) == "start") or (string.lower(action) == "stop") or (string.lower(action) == "restart") or (string.lower(action) == "setup") then - local file = io.popen(path .. "/etc/init.d/" .. processname .. " " .. string.lower(action) .. " 2>&1" ) - if file ~= nil then - result.value = file:read( "*a" ) or "" - file:close() - end - posix.sleep(2)-- Wait for the process to start|stop - else - result.errtxt = "Unknown command!" - end - - return result + return modelfunctions.startstop_service(processname, action, {"start", "stop", "restart", "setup"}) end function getstatus() diff --git a/postgresql-startstop-html.lsp b/postgresql-startstop-html.lsp index dbecda9..9b962c4 100644 --- a/postgresql-startstop-html.lsp +++ b/postgresql-startstop-html.lsp @@ -1,6 +1,15 @@ <% local data, viewlibrary, page_info = ... %> <H1>Management</H1> + +<% if data.value.result then %> +<H2>Previous action result</H2> +<% if data.value.result.value ~= "" then %> +<P CLASS='descr'><%= string.gsub(html.html_escape(data.value.result.value), "\n", "<BR>") %></P> +<% end if data.value.result.errtxt then %> +<P CLASS='error'><%= string.gsub(html.html_escape(data.value.result.errtxt), "\n", "<BR>") %></P> +<% end end %> + <DL> <form action="<%= html.html_escape(page_info.script .. page_info.prefix .. page_info.controller .. "/" .. page_info.action) %>" method="POST"> <DT>Program control-panel</DT> @@ -11,14 +20,4 @@ <input class="submit" type="submit" name="action" value="Restart" <% if data.value.status.value== "Stopped" then io.write("disabled") end %>> </DD> </form> - -<% if data.value.result then %> -<DT>Previous action result</DT> -<DD> -<% if data.value.result.value ~= "" then %> -<P CLASS='descr'><%= string.gsub(html.html_escape(data.value.result.value), "\n", "<BR>") %></P> -<% end if data.value.result.errtxt then %> -<P CLASS='error'><%= string.gsub(html.html_escape(data.value.result.errtxt), "\n", "<BR>") %></P> -<% end end %> -</DD> </DL> |