nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-status-page: remove workaround for now fixed LuCi bug

Browse Source
This commit is contained in:
Matthias Schiffer 2014-11-17 16:08:41 +01:00
parent 14553d42be
commit 104c92dfe6
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
package/gluon-status-page/files/lib/gluon/status-page/www/cgi-bin/status
View File

@ -76,26 +76,13 @@ for _, ifname in ipairs(interfaces) do
io.write("</pre>") io.write("</pre>")
end end
local err, fastd_status = pcall( local stat, fastd_status = pcall(
function() function()
local fastd_sock = nixio.socket('unix', 'stream') local fastd_sock = nixio.socket('unix', 'stream')
assert(fastd_sock:connect('/var/run/fastd.mesh_vpn.socket')) assert(fastd_sock:connect('/var/run/fastd.mesh_vpn.socket'))
-- Stop as soon as we see an empty chunk
local function guard_source(src)
return function()
local chunk, err = src()
if not chunk then return nil, err end
if chunk:len() == 0 then return nil end
return chunk
end
end
source = guard_source(ltn12.source.file(fastd_sock))
decoder = json.Decoder() decoder = json.Decoder()
ltn12.pump.all(source, decoder:sink()) ltn12.pump.all(ltn12.source.file(fastd_sock), decoder:sink())
fastd_sock:close()
return decoder:get() return decoder:get()
end end
) )
@ -103,7 +90,7 @@ local err, fastd_status = pcall(
io.write("<h2>VPN status</h2>") io.write("<h2>VPN status</h2>")
io.write("<pre>") io.write("<pre>")
if fastd_status then if stat then
io.write(string.format("fastd running for %.3f seconds\n", fastd_status.uptime/1000)) io.write(string.format("fastd running for %.3f seconds\n", fastd_status.uptime/1000))
local peers = 0 local peers = 0