mirror of
https://github.com/gSpotx2f/luci-app-internet-detector.git
synced 2025-12-06 03:26:50 +03:00
Minor fixes.
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=internet-detector
|
||||
PKG_VERSION:=1.6.5
|
||||
PKG_VERSION:=1.6.6
|
||||
PKG_RELEASE:=1
|
||||
PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/luci-app-internet-detector>
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ run_instance() {
|
||||
}
|
||||
|
||||
start_service() {
|
||||
config_load internet-detector
|
||||
config_load "internet-detector"
|
||||
config_get mode "config" mode "0"
|
||||
if [ $mode = "1" ]; then
|
||||
config_foreach run_instance "instance"
|
||||
|
||||
@@ -88,28 +88,21 @@ function InternetDetector:prequire(package)
|
||||
return ok and pkg
|
||||
end
|
||||
|
||||
function InternetDetector:loadUCIConfig(sType, instance)
|
||||
local success
|
||||
local num = 0
|
||||
uciCursor:foreach(
|
||||
self.appName,
|
||||
sType,
|
||||
function(s)
|
||||
if s[".name"] == instance then
|
||||
for k, v in pairs(s) do
|
||||
if type(v) == "string" and v:match("^[%d]+$") then
|
||||
v = tonumber(v)
|
||||
end
|
||||
self.serviceConfig[k] = v
|
||||
end
|
||||
success = true
|
||||
self.serviceConfig.instanceNum = num
|
||||
function InternetDetector:loadInstanceConfig(instance)
|
||||
local sections = uciCursor:get_all(self.appName)
|
||||
local t = sections[instance]
|
||||
if t then
|
||||
for k, v in pairs(t) do
|
||||
if type(v) == "string" and v:match("^[%d]+$") then
|
||||
v = tonumber(v)
|
||||
end
|
||||
num = num + 1
|
||||
self.serviceConfig[k] = v
|
||||
end
|
||||
)
|
||||
self.serviceConfig.instance = instance
|
||||
return success
|
||||
self.serviceConfig.instance = instance
|
||||
self.serviceConfig.instanceNum = t[".index"]
|
||||
return true
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
function InternetDetector:writeValueToFile(filePath, str)
|
||||
@@ -693,7 +686,7 @@ function InternetDetector:daemon()
|
||||
end
|
||||
|
||||
function InternetDetector:setServiceConfig(instance)
|
||||
if self:loadUCIConfig("instance", instance) then
|
||||
if self:loadInstanceConfig(instance) then
|
||||
self:parseHosts()
|
||||
if self.mode == 2 then
|
||||
self.loggingLevel = 0
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
local stdlib = require("posix.stdlib")
|
||||
local unistd = require("posix.unistd")
|
||||
local time = require("posix.time")
|
||||
local unistd = require("posix.unistd")
|
||||
|
||||
local Module = {
|
||||
name = "mod_regular_script",
|
||||
|
||||
Reference in New Issue
Block a user