Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[luci-app-openvpn] Optimized code and added suggested fix from #650

Browse source 
Signed-off-by: Vladimir Ulrich <admin@evl.su>
This commit is contained in:
Vladimir Ulrich 2016-03-25 19:28:35 +03:00
parent 5b79e62c0a
commit af5c9d4fb4
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
View file

@ -25,6 +25,10 @@ uci:foreach( "openvpn_recipes", "openvpn_recipe",
end end
) )
function s.getPID(section)
return sys.exec("%s | grep -w %s | grep openvpn | grep -v grep | awk '{print $1}'" % { psstring,section} )
end
function s.parse(self, section) function s.parse(self, section)
local recipe = luci.http.formvalue( local recipe = luci.http.formvalue(
luci.cbi.CREATE_PREFIX .. self.config .. "." .. luci.cbi.CREATE_PREFIX .. self.config .. "." ..
@ -68,7 +72,7 @@ s:option( Flag, "enabled", translate("Enabled") )
local active = s:option( DummyValue, "_active", translate("Started") ) local active = s:option( DummyValue, "_active", translate("Started") )
function active.cfgvalue(self, section) function active.cfgvalue(self, section)
local pid = sys.exec("%s | grep %s | grep openvpn | grep -v grep | awk '{print $1}'" % { psstring,section} ) local pid = s.getPID(section)
if pid and #pid > 0 and tonumber(pid) ~= nil then if pid and #pid > 0 and tonumber(pid) ~= nil then
return (sys.process.signal(pid, 0)) return (sys.process.signal(pid, 0))
and translatef("yes (%i)", pid) and translatef("yes (%i)", pid)
@ -83,7 +87,7 @@ updown.redirect = luci.dispatcher.build_url(
"admin", "services", "openvpn" "admin", "services", "openvpn"
) )
function updown.cbid(self, section) function updown.cbid(self, section)
local pid = sys.exec("%s | grep %s | grep openvpn | grep -v grep | awk '{print $1}'" % { psstring,section} ) local pid = s.getPID(section)
self._state = pid and #pid > 0 and sys.process.signal(pid, 0) self._state = pid and #pid > 0 and sys.process.signal(pid, 0)
self.option = self._state and "stop" or "start" self.option = self._state and "stop" or "start"
return AbstractValue.cbid(self, section) return AbstractValue.cbid(self, section)
@ -94,7 +98,7 @@ function updown.cfgvalue(self, section)
end end
function updown.write(self, section, value) function updown.write(self, section, value)
if self.option == "stop" then if self.option == "stop" then
local pid = sys.exec("%s | grep %s | grep openvpn | grep -v grep | awk '{print $1}'" % { psstring,section} ) local pid = s.getPID(section)
sys.process.signal(pid,15) sys.process.signal(pid,15)
else else
luci.sys.call("/etc/init.d/openvpn start %s" % section) luci.sys.call("/etc/init.d/openvpn start %s" % section)