summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@trask19.(none)>2009-06-04 16:06:57 +0000
committerroot <root@trask19.(none)>2009-06-04 16:06:57 +0000
commitb6cc4bda1e83dc30bc0ca5e45320a7cc4d9ebfc9 (patch)
treed9a655bc5184e4602bea2325c6574bfb78331059
parent7f30a68fe261844e8e5f28e7affb71ef89e2fc86 (diff)
downloadacf-shorewall-b6cc4bda1e83dc30bc0ca5e45320a7cc4d9ebfc9.tar.bz2
acf-shorewall-b6cc4bda1e83dc30bc0ca5e45320a7cc4d9ebfc9.tar.xz
Updated for startstop in core 0.5.0
-rw-r--r--shorewall-controller.lua2
-rw-r--r--shorewall-model.lua9
2 files changed, 2 insertions, 9 deletions
diff --git a/shorewall-controller.lua b/shorewall-controller.lua
index da88e40..99b31c4 100644
--- a/shorewall-controller.lua
+++ b/shorewall-controller.lua
@@ -31,7 +31,7 @@ function details(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 listfiles(self)
diff --git a/shorewall-model.lua b/shorewall-model.lua
index 1d78ebb..3669fc0 100644
--- a/shorewall-model.lua
+++ b/shorewall-model.lua
@@ -171,14 +171,7 @@ end
-- PUBLIC FUNCTIONS
function getstatus()
- local status = modelfunctions.getstatus(processname, packagename, "Shorewall Status")
- local details = getstatusdetails()
- if string.match(details.value, "Shorewall is running") then
- status.value.status.value = "Running"
- else
- status.value.status.value = "Stopped"
- end
- return status
+ return modelfunctions.getstatus(processname, packagename, "Shorewall Status")
end
function getstatusdetails()