From 4b5ff1ce12a2f418eb55b1a062515fe600a6c4b1 Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 25 Jan 2022 05:11:16 +1000 Subject: Tick or cross in the table for DNS-RR. --- Report-web_3.html | 5 ++++- apt-panopticon-report-email-web.lua | 21 ++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Report-web_3.html b/Report-web_3.html index 632e6f4..6eac6f7 100644 --- a/Report-web_3.html +++ b/Report-web_3.html @@ -7,7 +7,10 @@

TIMEOUT or TIMEOUT means the mirror had too many timeouts, and tests where aborted, so there is no result for this test.

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.

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.

-

The DNS round robin (DNS-RR) column shows the IPs for that mirror, or no if it isn't part of the DNS-RR.   The IPs link to the testing log for that IP accessed via the DNS-RR.   deb.devuan.org is the DNS-RR itself, so it doesn't get tested directly.

+

The DNS round robin (DNS-RR) column shows the IPs for that mirror, or no if it isn't part of the DNS-RR.   The IPs link to the testing log for that IP accessed via the DNS-RR. +   If a mirror should be it is marked with '✅', if it should not be it is marked with '❌'. +   deb.devuan.org is the DNS-RR itself, so it doesn't get tested directly. +

The time in the Updated column is how often the mirror updates itself.

Mirrors with a grey background are not active (though may be usable as part of the DNS-RR).

skip means that the test hasn't been written yet.

diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua index dd8cff6..622b0be 100755 --- a/apt-panopticon-report-email-web.lua +++ b/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 = "✅" + if nil ~= log:find("❌" 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 = "" .. i .. "" 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(" " .. k .. " ") end + hosts[k].passed = true; local inRR = "✅" local ftp = "skip" local http = status(hosts, k, results, "http") @@ -264,14 +269,7 @@ local makeTable = function(web, hosts) local week = '  ' if nil == rate then rate = '' end - -- DNS-RR test. --- if nil == http: find('OK') then inRR = "❌" end --- if nil == https: find('OK') then inRR = "❌" end --- if nil == protocol: find('OK') then inRR = "❌" end --- if nil == redirects: find('OK') then inRR = "❌" end --- if nil == sanity: find('OK') then inRR = "❌" end --- if nil == integrity: find('OK') then inRR = "❌" end --- if nil == updated: find('OK') then inRR = "❌" end + if not hosts[k].passed then inRR = "❌" 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 = ' ' .. percentUp .. '% up ' .. percentUpdated .. '% updated' -- if ('100.00' ~= percentUp) or ('100.00' ~= percentUpdated) then inRR = "❌" end end + if "yes" ~= hosts[k].DNSRR then inRR = "     " end - web:write("" .. ftp .. " " .. http .. " " .. https .. " " .. rsync .. " " .. dns .. + web:write("" .. ftp .. " " .. http .. " " .. https .. " " .. rsync .. " " .. inRR .. " " .. dns .. " " .. protocol .. " " .. redirects .. " " .. sanity .. " " .. integrity .. " " .. '' .. rate .. '' .. updated .. ' ' .. spd .. " " .. week .." \n") if "" ~= active then -- cgit v1.1