aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoronefang2019-12-29 10:15:13 +1000
committeronefang2019-12-29 10:15:13 +1000
commitf3bde4c7290095ccea71252433d1b8c495b616e8 (patch)
tree0e003ba9573b18db2fb596e51d923169a4ea7cd6
parentWhitespace++ (diff)
downloadapt-panopticon-f3bde4c7290095ccea71252433d1b8c495b616e8.zip
apt-panopticon-f3bde4c7290095ccea71252433d1b8c495b616e8.tar.gz
apt-panopticon-f3bde4c7290095ccea71252433d1b8c495b616e8.tar.bz2
apt-panopticon-f3bde4c7290095ccea71252433d1b8c495b616e8.tar.xz
Minor cleanups, no logic changes.
Diffstat (limited to '')
-rwxr-xr-xapt-panopticon-report-email-web.lua1
-rwxr-xr-xapt-panopticon.lua2
2 files changed, 1 insertions, 2 deletions
diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua
index f69ffcd..7d5ce7f 100755
--- a/apt-panopticon-report-email-web.lua
+++ b/apt-panopticon-report-email-web.lua
@@ -634,6 +634,7 @@ if nil == web then C("opening mirrors file - " .. e) else
634 if "" == log then n[l] = w else n[log .. " " .. revDNS(APT.debians, k, l)] = w end 634 if "" == log then n[l] = w else n[log .. " " .. revDNS(APT.debians, k, l)] = w end
635 end 635 end
636 end 636 end
637
637 m[log .. " DNS entries -" .. redirs(APT.mirrors, k)] = n 638 m[log .. " DNS entries -" .. redirs(APT.mirrors, k)] = n
638 end 639 end
639 web:write(APT.dumpTableHTML(m, "")) 640 web:write(APT.dumpTableHTML(m, ""))
diff --git a/apt-panopticon.lua b/apt-panopticon.lua
index b45ca45..25c2b49 100755
--- a/apt-panopticon.lua
+++ b/apt-panopticon.lua
@@ -386,7 +386,6 @@ checkHEAD = function (host, URL, r, retry, sanity)
386 local pth = path:match('^(.*/pool/).*$') 386 local pth = path:match('^(.*/pool/).*$')
387 if nil ~= pth then table.insert(APT.results[PU.scheme].redirects, pu.host .. "/" .. pth) else E('Odd redirect path ' .. path) end 387 if nil ~= pth then table.insert(APT.results[PU.scheme].redirects, pu.host .. "/" .. pth) else E('Odd redirect path ' .. path) end
388 I(" Now checking redirected host " .. u) 388 I(" Now checking redirected host " .. u)
389-- APT.fork("ionice -c3 nice -n 19 " .. downloadLock .. "REDIR-" .. check .. ".log.txt" .. " ./apt-panopticon.lua " .. extraArgs .. ' ' .. pu.host .. "/" .. path .. " " .. file)
390 APT.exe(downloadLock .. "REDIR-" .. check .. ".log.txt" .. " ./apt-panopticon.lua " .. extraArgs .. ' ' .. pu.host .. "/" .. path .. " " .. file):Nice():log():fork() 389 APT.exe(downloadLock .. "REDIR-" .. check .. ".log.txt" .. " ./apt-panopticon.lua " .. extraArgs .. ' ' .. pu.host .. "/" .. path .. " " .. file):Nice():log():fork()
391 D('logging to ' .. APT.logName(pu.host, nil, file)[2]) 390 D('logging to ' .. APT.logName(pu.host, nil, file)[2])
392 end 391 end
@@ -1134,7 +1133,6 @@ os.execute('sleep 1') -- Wait for things to start up before checking for them.
1134 for j, b in pairs(a) do 1133 for j, b in pairs(a) do
1135 IPfiles[i][j] = {} 1134 IPfiles[i][j] = {}
1136 end 1135 end
1137 else
1138 end 1136 end
1139 end 1137 end
1140 local files = io.popen('ls -1 results/LOG_' .. hst .. '_*.html') 1138 local files = io.popen('ls -1 results/LOG_' .. hst .. '_*.html')