diff options
| author | root <root@trask19.(none)> | 2009-06-04 16:03:33 +0000 |
|---|---|---|
| committer | root <root@trask19.(none)> | 2009-06-04 16:03:33 +0000 |
| commit | bfe1568cf01ccaf7ce18702263835313e39d111c (patch) | |
| tree | fe3573ddff94103350f4166cbaf4506e090a7dbf | |
| parent | e5a0bba3ff581e9b6c0bb964f267a6d8367d0b16 (diff) | |
| download | acf-postgresql-bfe1568cf01ccaf7ce18702263835313e39d111c.tar.bz2 acf-postgresql-bfe1568cf01ccaf7ce18702263835313e39d111c.tar.xz | |
Updated for startstop in core 0.5.0
| -rw-r--r-- | postgresql-controller.lua | 2 | ||||
| -rw-r--r-- | postgresql-model.lua | 21 | ||||
| l---------[-rw-r--r--] | postgresql-startstop-html.lsp | 24 |
3 files changed, 4 insertions, 43 deletions
diff --git a/postgresql-controller.lua b/postgresql-controller.lua index cf6301f..91ce5f8 100644 --- a/postgresql-controller.lua +++ b/postgresql-controller.lua @@ -10,7 +10,7 @@ function status(self) end function startstop(self) - return controllerfunctions.handle_startstop(self, self.model.startstop_service, self.model.getstatus, self.clientdata) + return controllerfunctions.handle_startstop(self, self.model.startstop_service, self.clientdata) end function details(self) diff --git a/postgresql-model.lua b/postgresql-model.lua index 2479796..90aa30c 100644 --- a/postgresql-model.lua +++ b/postgresql-model.lua @@ -22,28 +22,11 @@ local filelist = fs.find_files_as_array(".*\.conf", datadirectory) -- PUBLIC FUNCTIONS function startstop_service(action) - return modelfunctions.startstop_service(processname, action, {"start", "stop", "restart", "setup"}) + return modelfunctions.startstop_service(processname, action, {"Setup", "Start", "Stop", "Restart"}) end function getstatus() - local status = modelfunctions.getstatus(processname, packagename, "Postgresql Status") - - -- Enabled status is unique for postgresql - -- Look for pid file stored in data_directory .. /postmaster.pid - local file = datadirectory .. pidfile - -- check to see if there's a matching proc directory and that it was created slightly after the pid file - -- this allows us to avoid the problem with proc numbers wrapping - local tmp = string.match(fs.read_file(file) or "", "%d+") - if tmp then - local dir = "/proc/" .. tmp - filetime = posix.stat(file, "ctime") - dirtime = posix.stat(dir, "ctime") - if dirtime and (tonumber(dirtime) - tonumber(filetime) < 100) then - status.value.status.value = "Running" - end - end - - return status + return modelfunctions.getstatus(processname, packagename, "Postgresql Status") end function getstatusdetails() diff --git a/postgresql-startstop-html.lsp b/postgresql-startstop-html.lsp index 9b962c4..0ea2627 100644..120000 --- a/postgresql-startstop-html.lsp +++ b/postgresql-startstop-html.lsp @@ -1,23 +1 @@ -<% 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> -<DD> -<input class="submit" type="submit" name="action" value="Setup" <% if data.value.status.value== "Running" then io.write("disabled") end %>> -<input class="submit" type="submit" name="action" value="Start" <% if data.value.status.value== "Running" then io.write("disabled") end %>> -<input class="submit" type="submit" name="action" value="Stop" <% if data.value.status.value== "Stopped" then io.write("disabled") end %>> -<input class="submit" type="submit" name="action" value="Restart" <% if data.value.status.value== "Stopped" then io.write("disabled") end %>> -</DD> -</form> -</DL> +../startstop-html.lsp
\ No newline at end of file |