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

Merge pull request #1110 from psyborg55/psyborg55-patch-1

Browse source 
luci-app-mwan3: disable uci/sed errors print to syslog
This commit is contained in:
Hannu Nyman 2017-04-18 15:40:03 +03:00 committed by GitHub
commit cee4427eeb
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
applications/luci-app-mwan3/luasrc/controller/mwan3.lua
View file

@ -64,9 +64,9 @@ function index()
end end
function getInterfaceStatus(ruleNumber, interfaceName) function getInterfaceStatus(ruleNumber, interfaceName)
if ut.trim(sys.exec("uci -p /var/state get mwan3." .. interfaceName .. ".enabled")) == "1" then if ut.trim(sys.exec("uci -q -p /var/state get mwan3." .. interfaceName .. ".enabled")) == "1" then
if ut.trim(sys.exec(ip .. "route list table " .. ruleNumber)) ~= "" then if ut.trim(sys.exec(ip .. "route list table " .. ruleNumber)) ~= "" then
if ut.trim(sys.exec("uci -p /var/state get mwan3." .. interfaceName .. ".track_ip")) ~= "" then if ut.trim(sys.exec("uci -q -p /var/state get mwan3." .. interfaceName .. ".track_ip")) ~= "" then
return "online" return "online"
else else
return "notMonitored" return "notMonitored"
@ -102,7 +102,7 @@ function interfaceStatus()
wansid = {} wansid = {}
for wanName, interfaceState in string.gfind(statusString, "([^%[]+)%[([^%]]+)%]") do for wanName, interfaceState in string.gfind(statusString, "([^%[]+)%[([^%]]+)%]") do
local wanInterfaceName = ut.trim(sys.exec("uci -p /var/state get network." .. wanName .. ".ifname")) local wanInterfaceName = ut.trim(sys.exec("uci -q -p /var/state get network." .. wanName .. ".ifname"))
if wanInterfaceName == "" then if wanInterfaceName == "" then
wanInterfaceName = "X" wanInterfaceName = "X"
end end
@ -115,7 +115,7 @@ function interfaceStatus()
end end
-- overview status log -- overview status log
local mwanLog = ut.trim(sys.exec("logread | grep mwan3 | tail -n 50 | sed 'x;1!H;$!d;x'")) local mwanLog = ut.trim(sys.exec("logread | grep mwan3 | tail -n 50 | sed 'x;1!H;$!d;x' 2>/dev/null"))
if mwanLog ~= "" then if mwanLog ~= "" then
mArray.mwanlog = { mwanLog } mArray.mwanlog = { mwanLog }
end end
@ -163,7 +163,7 @@ function diagnosticsData(interface, tool, task)
results = "MWAN3 started" results = "MWAN3 started"
end end
else else
local interfaceDevice = ut.trim(sys.exec("uci -p /var/state get network." .. interface .. ".ifname")) local interfaceDevice = ut.trim(sys.exec("uci -q -p /var/state get network." .. interface .. ".ifname"))
if interfaceDevice ~= "" then if interfaceDevice ~= "" then
if tool == "ping" then if tool == "ping" then
local gateway = ut.trim(sys.exec("route -n | awk '{if ($8 == \"" .. interfaceDevice .. "\" && $1 == \"0.0.0.0\" && $3 == \"0.0.0.0\") print $2}'")) local gateway = ut.trim(sys.exec("route -n | awk '{if ($8 == \"" .. interfaceDevice .. "\" && $1 == \"0.0.0.0\" && $3 == \"0.0.0.0\") print $2}'"))
@ -172,7 +172,7 @@ function diagnosticsData(interface, tool, task)
local pingCommand = "ping -c 3 -W 2 -I " .. interfaceDevice .. " " .. gateway local pingCommand = "ping -c 3 -W 2 -I " .. interfaceDevice .. " " .. gateway
results = pingCommand .. "\n\n" .. sys.exec(pingCommand) results = pingCommand .. "\n\n" .. sys.exec(pingCommand)
else else
local tracked = ut.trim(sys.exec("uci -p /var/state get mwan3." .. interface .. ".track_ip")) local tracked = ut.trim(sys.exec("uci -q -p /var/state get mwan3." .. interface .. ".track_ip"))
if tracked ~= "" then if tracked ~= "" then
for z in tracked:gmatch("[^ ]+") do for z in tracked:gmatch("[^ ]+") do
local pingCommand = "ping -c 3 -W 2 -I " .. interfaceDevice .. " " .. z local pingCommand = "ping -c 3 -W 2 -I " .. interfaceDevice .. " " .. z
@ -301,7 +301,7 @@ function troubleshootingData()
mArray.iprule = { ipRuleShow } mArray.iprule = { ipRuleShow }
-- ip route list table 1-250 -- ip route list table 1-250
local routeList, routeString = ut.trim(sys.exec(ip .. "rule | sed 's/://g' | awk '$1>=2001 && $1<=2250' | awk '{print $NF}'")), "" local routeList, routeString = ut.trim(sys.exec(ip .. "rule | sed 's/://g' 2>/dev/null | awk '$1>=2001 && $1<=2250' | awk '{print $NF}'")), ""
if routeList ~= "" then if routeList ~= "" then
for line in routeList:gmatch("[^\r\n]+") do for line in routeList:gmatch("[^\r\n]+") do
routeString = routeString .. line .. "\n" .. sys.exec(ip .. "route list table " .. line) routeString = routeString .. line .. "\n" .. sys.exec(ip .. "route list table " .. line)
@ -313,7 +313,7 @@ function troubleshootingData()
mArray.routelist = { routeString } mArray.routelist = { routeString }
-- default firewall output policy -- default firewall output policy
local firewallOut = ut.trim(sys.exec("uci -p /var/state get firewall.@defaults[0].output")) local firewallOut = ut.trim(sys.exec("uci -q -p /var/state get firewall.@defaults[0].output"))
if firewallOut == "" then if firewallOut == "" then
firewallOut = "No data found" firewallOut = "No data found"
end end