diff options
author | Alexander Poslavsky <alexander.poslavsky@gmail.com> | 2007-11-02 13:09:49 +0000 |
---|---|---|
committer | Alexander Poslavsky <alexander.poslavsky@gmail.com> | 2007-11-02 13:09:49 +0000 |
commit | cd93f289dc1b17ddeeaab83cc49d789c9454c158 (patch) | |
tree | 21501c2c61162b9fec4a5d6b551fb2b770b1f3b9 | |
parent | 5e22762db6347206298a823199d6e523d2dbf9e7 (diff) | |
download | acf-shorewall-cd93f289dc1b17ddeeaab83cc49d789c9454c158.tar.bz2 acf-shorewall-cd93f289dc1b17ddeeaab83cc49d789c9454c158.tar.xz |
corrected code to be more MVC-like
git-svn-id: svn://svn.alpinelinux.org/acf/shorewall/trunk@260 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r-- | shorewall-controller.lua | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/shorewall-controller.lua b/shorewall-controller.lua index 1c87fbe..34bbc11 100644 --- a/shorewall-controller.lua +++ b/shorewall-controller.lua @@ -6,16 +6,13 @@ local list_redir = function(self) error(self.conf) end +local cfgfile +local service + mvc={} mvc.on_load = function(self, parent) - --TODO: This needs to be looked at - --there has to be cute, standard way of loading models into controller - self.cfgfile = self:soft_require("cfgfile-model") - setmetatable(self.cfgfile, self.cfgfile) - self.cfgfile.__index = self.worker - self.service = self:soft_require("service-model") - setmetatable(self.service, self.service) - self.service.__index = self.worker + cfgfile = self:new("cfgfile") + service = self:new("service") if (self.worker[self.conf.action] == nil) or (self.conf.action == "init") then self.worker[self.conf.action] = list_redir(self) end @@ -26,7 +23,7 @@ end local function getNotes(self) ret = {} - for k,v in pairs(self.cfgfile:list(nil)) do + for k,v in pairs(cfgfile.model:list(nil)) do if v.status then ret[#ret + 1] = { content = "There are some configuration changes. Please do not forget to save." @@ -39,7 +36,7 @@ end read = function(self) return { - list=self.cfgfile:list(function(x) return x.app == "firewall" end), + list=cfgfile.model:list(function(x) return x.app == "firewall" end), script=ENV["SCRIPT_NAME"], prefix=self.conf.prefix, controller=self.conf.controller, @@ -53,7 +50,7 @@ update = function(self) local result local data - result, data = self.cfgfile:get(id) + result, data = cfgfile.model:get(id) if not result then return list_redir(self) end if self.clientdata.cmd then @@ -62,7 +59,7 @@ update = function(self) data[k].value = self.clientdata[k] end end - result, data = self.cfgfile:set(id, data) + result, data = cfgfile.model:set(id, data) if result then return list_redir(self) end end @@ -76,9 +73,9 @@ update = function(self) value = data} end -local function service(self, action) +local function serviceAction(self, action) local id = tonumber(self.clientdata.id) or -1 - local svc = self.service:list("firewall") + local svc = service.model:list("firewall") local ret = { script=ENV["SCRIPT_NAME"], prefix=self.conf.prefix, @@ -99,7 +96,7 @@ local function service(self, action) end end if self.clientdata[action] then - local result, report = self.service:update(id, action) + local result, report = service.model:update(id, action) local label = "Error" if result then ret.active.action = action @@ -111,7 +108,7 @@ local function service(self, action) return ret end -start = function(self) return service(self, "start") end -stop = function(self) return service(self, "stop") end -restart = function(self) return service(self, "restart") end +start = function(self) return serviceAction(self, "start") end +stop = function(self) return serviceAction(self, "stop") end +restart = function(self) return serviceAction(self, "restart") end |