This lists each mirror, and the DNS entries for that mirror. " ..
"The links point to the testing log files for " .. logCount("apt-panopticon") .. " for each domain name / IP combination that was tested. " ..
@@ -453,8 +472,118 @@ if nil == web then C("opening mirrors file - " .. e) else
)
web:write(APT.dumpTableHTML(m, "", ""))
web:write( "\n
\n
\n
==== graphs: ====
\n" .. - "
\n\n
More graphs. with greater detail.
\n\n" .. - "
The email report. " ..
+ "\n
\n
More graphs. with greater detail.
\n\n") + + results = {} + m = {} + faulty = "" + web:write( "
\n
==== Debian mirror status ====
\n" .. + "NOTE - This is not fully probing the Debian mirrors, we just collect some data from any redirects to other servers. " .. + "So this isn't a full set of tests.
\n" .. + "EXPERIMENTAL CODE - this is even more experimental than the rest.
\n" .. + "| FTP | HTTP | HTTPS | RSYNC | DNS round robin | " .. + "Protocol | URL sanity | Integrity | Updated | Speed range | ||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| " .. k .. " | ") + else + if nil == v.Active then active = 'nil' else active = v.Active end + web:write("|||||||||||||
| " .. k .. " | ") + end + local ftp = "[skip]" + local http = status(APT.debians, k, results, "http") + local https = status(APT.debians, k, results, "https") + local rsync = "[skip]" + local dns = "" + local protocol = status(APT.debians, k, results, "Protocol") + local sanity = status(APT.debians, k, results, "URLSanity") + local integrity = status(APT.debians, k, results, "Integrity") + local updated = status(APT.debians, k, results, "Updated") + local rate = v.Rate + if nil ~= rate then updated = updated .. ' ' .. rate end + local min = tonumber(results.speed.min) + local max = tonumber(results.speed.max) + local spd = '' + + -- DNS-RR test. + if ("deb.devuan.org" ~= k) and (nil ~= APT.debians["deb.devuan.org"]) then + for l, w in pairs(APT.debians[k].IPs) do + if type(w) == "table" then + for i, u in pairs(w) do + if nil ~= APT.debians["deb.devuan.org"].IPs["deb.roundr.devuan.org"][i] then + local log = logCount("deb.devuan.org", i) + if "" ~= log then + if "" == dns then dns = " " else dns = dns .. " " end + dns = dns .. logCount("deb.devuan.org", i) + else + if "" == dns then dns = " " else dns = dns .. " " end + dns = dns .. "" .. i .. "" + end + end + end + else + if nil ~= APT.debians["deb.devuan.org"].IPs["deb.roundr.devuan.org"][l] then + local log = logCount("deb.devuan.org", l) + if "" ~= log then + if "" == dns then dns = " " else dns = dns .. " " end + dns = dns .. log + else + if "" == dns then dns = " " else dns = dns .. " " end + dns = dns .. "" .. l .. "" + end + end + end + end + if "" == dns then dns = "[no]" end + + if 0 == max then + spd = '' + else + spd = string.format(' | %d -> | %d | ', min, max) + end + end + + web:write("" .. ftp .. " | " .. http .. " | " .. https .. " | " .. rsync .. " | " .. dns .. + " | " .. protocol .. " | " .. sanity .. + " | " .. integrity .. " | " .. updated .. " | " .. spd .. "|
| " .. active .. " | |||||||||||||
\n\n") + + web:write( "
\n
\n
==== Debian DNS and logs: ====
\n") + + for k, v in pairs(APT.debians) do + local log = k + local n = {} + log = logCount(k) + APT.debians[k].Protocols = nil + APT.debians[k].FQDN = nil + APT.debians[k].Active = nil + APT.debians[k].Rate = nil + APT.debians[k].BaseURL = nil + APT.debians[k].Country = nil + APT.debians[k].Bandwidth = nil + for l, w in pairs(APT.debians[k].IPs) do + if type(w) == "table" then + n[l] = {} + for i, u in pairs(w) do + local log = logCount(k, i) + if "" == log then n[l][i] = u else n[l][log .. " " .. revDNS(APT.debians, k, i)] = u end + end + else + local log = logCount(k, l) + if "" == log then n[l] = w else n[log .. " " .. revDNS(APT.debians, k, l)] = w end + end + end + m[log .. " DNS entries -" .. redirs(APT.mirrors, k)] = n + end + web:write(APT.dumpTableHTML(m, "", "")) + + web:write( "\n
\n
The email report. " .. "All the logs and other output. " .. "You can get the source code here.
\n") local status, whn = APT.execute('TZ="GMT" ls -l1 --time-style="+%s" results/stamp | cut -d " " -f 6-6') diff --git a/apt-panopticon.lua b/apt-panopticon.lua index 13adead..b2827b4 100755 --- a/apt-panopticon.lua +++ b/apt-panopticon.lua @@ -376,6 +376,8 @@ checkHEAD = function (host, URL, r, retry, sanity) local extraArgs = sendArgs .. ' -o -r ' if 'https' == pu.scheme then extraArgs = extraArgs .. ' --tests=-http' end if 'http' == pu.scheme then extraArgs = extraArgs .. ' --tests=-https' end + local pth = path:match('^(.*/pool/).*$') + if nil ~= pth then table.insert(APT.results[PU.scheme].redirects, pu.host .. "/" .. pth) else E('Odd redirect path ' .. path) end I(" Now checking redirected host " .. u) APT.fork("ionice -c3 nice -n 19 " .. downloadLock .. "REDIR-" .. check .. ".log.txt" .. " ./apt-panopticon.lua " .. extraArgs .. ' ' .. pu.host .. "/" .. path .. " " .. file) D('logging to ' .. APT.logName(pu.host, nil, file)[2]) @@ -422,12 +424,10 @@ local checkFiles = function (host, ip, path, file) end end end - for i, s in pairs(referenceDebs) do if checkTimeouts(host, "http", ip .. path .. "/" .. s) then return end if checkTimeouts(host, "https", ip .. path .. "/" .. s) then return end end - for i, s in pairs(referenceDevs) do if checkTimeouts(host, "http", ip .. path .. "/" .. s) then return end if checkTimeouts(host, "https", ip .. path .. "/" .. s) then return end @@ -994,7 +994,7 @@ if 0 < #arg then rfile:close() end - if APT.origin and APT.options.referenceSite.value ~= pu.host then + if APT.origin and (not APT.redir) and (APT.options.referenceSite.value ~= pu.host) then os.execute('sleep 1') -- Wait for things to start up before checking for them. while 0 < APT.checkExes(downloadLock .. "Release-" .. pu.host .. ".log.txt") do os.execute("sleep 10") end while 0 < APT.checkExes(downloadLock .. "Packages-" .. pu.host .. ".log.txt") do os.execute("sleep 10") end @@ -1038,6 +1038,103 @@ else os.execute('sleep 1') -- Wait for things to start up before checking for them. while 1 <= APT.checkExes("apt-panopticon.lua " .. sendArgs) do os.execute("sleep 10") end + local APT_args = APT.args + local APT_logFile = APT.logFile + local debians = {} + local srvs = io.popen('ls -1 results/*.lua') + for l in srvs:lines() do + local hst = l:sub(9, -5) + if (l:find('_') == nil) and (nil == APT.mirrors[hst]) then + local ips = loadfile(l)().IPs + if nil ~= ips then + debians[hst] = {Country = '', FDQN = hst, Active = 'yes', Rate = '', BaseURL = hst, Protocols = {http = true, https = true}, Bandwidth = '', IPs = ips} + local baseFiles = {} + local IPfiles = {} + for i, a in pairs(ips) do + IPfiles[i] = {} + if type(a) == 'table' then + for j, b in pairs(a) do + IPfiles[i][j] = {} + end + else + end + end + local files = io.popen('ls -1 results/LOG_' .. hst .. '_*.html') + for ll in files:lines() do + local dn = false + for i, a in pairs(ips) do + if type(a) == 'table' then + for j, b in pairs(a) do + if nil ~= ll:match('(results/LOG_' .. hst .. '_' .. j .. '_.*)') then + table.insert(IPfiles[i][j], ll) + dn = true + end + end + else + if nil ~= ll:match('(results/LOG_' .. hst .. '_' .. i .. '_.*)') then + table.insert(IPfiles[i], ll) + dn = true + end + end + end + if not dn then table.insert(baseFiles, ll) end + end + + APT.logOpen(hst) + APT.logFile:write('Note log lines will be out of order, this is a bunch of other log files combined.
\n') + for i, f in pairs(baseFiles) do + f = f:sub(9, -1) + APT.logFile:write('\n
\n
' .. f .. '
\n') + for l in io.lines('results/' .. f) do + if l:match('^' .. os.date('%a %b %d ') .. '.*$') then APT.logFile:write(l .. '\n') end + end + end + APT.logPost() + APT.args = APT_args + APT.logFile = APT_logFile + + for ip, a in pairs(IPfiles) do + if nil == a[1] then + for i, f in pairs(a) do + if not APT.logOpen(hst, i) then print('PROBLEM OPENING LOG FILE ' .. hst .. ' ' .. i) end + APT.logFile:write('Note log lines will be out of order, this is a bunch of other log files combined.
\n') + for j, g in pairs(f) do + g = g:sub(9, -1) + APT.logFile:write('\n
\n
' .. g .. '
\n') + for l in io.lines('results/' .. g) do + if l:match('^' .. os.date('%a %b %d ') .. '.*$') then APT.logFile:write(l .. '\n') end + end + end + APT.logPost() + APT.args = APT_args + APT.logFile = APT_logFile + end + else + if not APT.logOpen(hst, ip) then print('PROBLEM OPENING LOG FILE ' .. hst .. ' ' .. ip) end + APT.logFile:write('Note log lines will be out of order, this is a bunch of other log files combined.
\n') + for i, f in pairs(a) do + f = f:sub(9, -1) + APT.logFile:write('\n
\n