Browse Source

Tick or cross in the table for DNS-RR.

master
onefang 1 year ago
parent
commit
4b5ff1ce12
  1. 5
      Report-web_3.html
  2. 21
      apt-panopticon-report-email-web.lua

5
Report-web_3.html

@ -7,7 +7,10 @@
<p><font color='aqua'><b>TIMEOUT</b></font> or <font color='blue'><b>TIMEOUT</b></font> means the mirror had too many timeouts, and tests where aborted, so there is no result for this test.</p>
<p>NOTE: timeouts may be due to a problem on the testing computer, it might be busy with other things, or be having it's own network problems.</p>
<p>NOTE: the speed of the server this checking script is running on might be wildly exaggerated, it doesn't have to go through the Internet to download from itself.</p>
<p>The DNS round robin (DNS-RR) column shows the IPs for that mirror, or <font color='grey'><b>no</b></font> if it isn't part of the DNS-RR. &nbsp; The IPs link to the testing log for that IP accessed via the DNS-RR. &nbsp; deb.devuan.org is the DNS-RR itself, so it doesn't get tested directly.</p>
<p>The DNS round robin (DNS-RR) column shows the IPs for that mirror, or <font color='grey'><b>no</b></font> if it isn't part of the DNS-RR. &nbsp; The IPs link to the testing log for that IP accessed via the DNS-RR.
&nbsp; If a mirror <a href='DNS-RR_good.txt'>should be</a> it is marked with '<font color='green'><b>&#x2705;</b></font>', if it <a href='DNS-RR_bad.txt'>should not be</a> it is marked with '<font color='red'>&#x274c;</font>'.
&nbsp; deb.devuan.org is the DNS-RR itself, so it doesn't get tested directly.
</p>
<p>The time in the Updated column is how often the mirror updates itself.</p>
<p>Mirrors with a <font style='background-color:dimgrey'>grey background</font> are not active (though may be usable as part of the DNS-RR).</p>
<p><font color='grey'><b>skip</b></font> means that the test hasn't been written yet.</p>

21
apt-panopticon-report-email-web.lua

@ -89,6 +89,7 @@ local status = function(hosts, host, results, typ)
if to then
result = "TIMEOUT"
hosts[host].passed = false;
if not s then result = result .. "*" end
if APT.html then
if s then
@ -104,6 +105,7 @@ local status = function(hosts, host, results, typ)
end
elseif 0 < e then
result = "FAILED"
hosts[host].passed = false;
if not s then result = result .. "*" end
if APT.html then
if s then
@ -206,13 +208,15 @@ local DNSrrTest = function(hosts, k)
if nil ~= hosts[APT.options.roundRobin.value].IPs[APT.options.roundRobinCname.value] then
if nil ~= hosts[APT.options.roundRobin.value].IPs[APT.options.roundRobinCname.value][i] then
local log = logCount(APT.options.roundRobin.value, i)
local inRR = "<font color='green'><b>&#x2705;</b></font>"
if nil ~= log:find("<font color='") then inRR = "<font color='red'>&#x274c;</font>" end
if "" ~= log then
if "" == dns then dns = " " else dns = dns .. space end
dns = dns .. logCount(APT.options.roundRobin.value, i)
dns = dns .. inRR .. logCount(APT.options.roundRobin.value, i)
else
if "" == dns then dns = " " else dns = dns .. space end
if APT.html then i = "<font color='maroon'><b>" .. i .. "</b></font>" end
dns = dns .. i
dns = dns .. inRR .. i
end
end
end
@ -246,6 +250,7 @@ local makeTable = function(web, hosts)
if nil == v.Active then active = 'nil' else active = v.Active end
web:write(" <tr style='background-color:dimgrey'><th>" .. k .. "</th> ")
end
hosts[k].passed = true;
local inRR = "<font color='green'><b>&#x2705;</b></font>"
local ftp = "<font color='grey'><b>skip</b></font>"
local http = status(hosts, k, results, "http")
@ -264,14 +269,7 @@ local makeTable = function(web, hosts)
local week = '<td>&nbsp;</td><td>&nbsp;</td>'
if nil == rate then rate = '' end
-- DNS-RR test.
-- if nil == http: find('OK') then inRR = "<font color='red'>&#x274c;</font>" end
-- if nil == https: find('OK') then inRR = "<font color='red'>&#x274c;</font>" end
-- if nil == protocol: find('OK') then inRR = "<font color='red'>&#x274c;</font>" end
-- if nil == redirects: find('OK') then inRR = "<font color='red'>&#x274c;</font>" end
-- if nil == sanity: find('OK') then inRR = "<font color='red'>&#x274c;</font>" end
-- if nil == integrity: find('OK') then inRR = "<font color='red'>&#x274c;</font>" end
-- if nil == updated: find('OK') then inRR = "<font color='red'>&#x274c;</font>" end
if not hosts[k].passed then inRR = "<font color='red'>&#x274c;</font>" end
if (APT.options.roundRobin.value ~= k) and (nil ~= hosts[APT.options.roundRobin.value]) then
if 0 == max then
@ -323,8 +321,9 @@ local makeTable = function(web, hosts)
week = '<td>&nbsp;' .. percentUp .. '% up</td><td>&nbsp;' .. percentUpdated .. '% updated</td>'
-- if ('100.00' ~= percentUp) or ('100.00' ~= percentUpdated) then inRR = "<font color='red'>&#x274c;</font>" end
end
if "yes" ~= hosts[k].DNSRR then inRR = " &nbsp; &nbsp; " end
web:write("<td>" .. ftp .. "&nbsp;</td><td>" .. http .. "&nbsp;</td><td>" .. https .. "&nbsp;</td><td>" .. rsync .. "&nbsp;</td><td>" .. dns ..
web:write("<td>" .. ftp .. "&nbsp;</td><td>" .. http .. "&nbsp;</td><td>" .. https .. "&nbsp;</td><td>" .. rsync .. "&nbsp;</td><td>" .. inRR .. " " .. dns ..
"&nbsp;</td><td>" .. protocol .. "&nbsp;</td><td>" .. redirects .. "&nbsp;</td><td>" .. sanity .. "&nbsp;</td><td>" .. integrity .. "&nbsp;</td>" .. '<td>' .. rate ..
'</td><td>' .. updated .. '</td>&nbsp;' .. spd .. "&nbsp;" .. week .."&nbsp;</tr>\n")
if "" ~= active then

Loading…
Cancel
Save