luci-app-openvpn: properly parse low PIDs

[project/luci.git] / applications / luci-app-openvpn / luasrc / model / cbi / openvpn.lua

diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
index 1a1d33a..d2b5d32 100644 (file)
--- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
+++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua
@@ -25,8 +25,13 @@ uci:foreach( "openvpn_recipes", "openvpn_recipe",
        end
 )
 
-function s.getPID(section)
-       return sys.exec("%s | grep -w %s | grep openvpn | grep -v grep | awk '{print $1}'" % { psstring,section} )
+function s.getPID(section) -- Universal function which returns valid pid # or nil
+       local pid = sys.exec("%s | grep -w '[o]penvpn(%s)'" % { psstring, section })
+       if pid and #pid > 0 then
+               return tonumber(pid:match("^%s*(%d+)"))
+       else
+               return nil
+       end
 end
 
 function s.parse(self, section)
@@ -73,7 +78,7 @@ s:option( Flag, "enabled", translate("Enabled") )
 local active = s:option( DummyValue, "_active", translate("Started") )
 function active.cfgvalue(self, section)
        local pid = s.getPID(section)
-       if pid and #pid > 0 and tonumber(pid) ~= nil then
+       if pid ~= nil then
                return (sys.process.signal(pid, 0))
                        and translatef("yes (%i)", pid)
                        or  translate("no")
@@ -88,7 +93,7 @@ updown.redirect = luci.dispatcher.build_url(
 )
 function updown.cbid(self, section)
        local pid = s.getPID(section)
-       self._state = pid and #pid > 0 and sys.process.signal(pid, 0)
+       self._state = pid ~= nil and sys.process.signal(pid, 0)
        self.option = self._state and "stop" or "start"
        return AbstractValue.cbid(self, section)
 end
@@ -99,7 +104,9 @@ end
 function updown.write(self, section, value)
        if self.option == "stop" then
                local pid = s.getPID(section)
-               sys.process.signal(pid,15)
+               if pid ~= nil then
+                       sys.process.signal(pid,15)
+               end
        else
                luci.sys.call("/etc/init.d/openvpn start %s" % section)
        end