From 91b6eba0f7c4fd44dd79f0e868bb9e7a92bccce7 Mon Sep 17 00:00:00 2001
From: onefang
Date: Tue, 31 Dec 2019 16:20:14 +1000
Subject: Add Redirects tests fully.

---
 apt-panopticon-report-email-web.lua | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'apt-panopticon-report-email-web.lua')

diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua
index 05699ee..3365d78 100755
--- a/apt-panopticon-report-email-web.lua
+++ b/apt-panopticon-report-email-web.lua
@@ -212,7 +212,8 @@ end
 
 local makeTable = function(web, hosts)
     web:write("<table>\n<tr><th></th><th>" .. lnk('FTP') .. "</th><th>" .. lnk('HTTP') .. "</th><th>" .. lnk('HTTPS') .. "</th><th>" .. lnk('RSYNC') .. "</th>" .. 
-		"<th>" .. lnk('DNS round robin', 'DNS-RR') .. "</th><th>" .. lnk('Protocol') .. "</th><th>" .. lnk('URL sanity', 'URL-Sanity') .. "</th><th>" .. lnk('Integrity') .. "</th>" ..
+		"<th>" .. lnk('DNS round robin', 'DNS-RR') .. "</th><th>" .. lnk('Protocol') .. "</th><th>" .. lnk('Redirects') ..
+		"</th><th>" .. lnk('URL sanity', 'URL-Sanity') .. "</th><th>" .. lnk('Integrity') .. "</th>" ..
 		"<th colspan='2'>" .. lnk('Updated') .. "</th><th colspan='2'>" .. lnk('Speed range', 'Speed') .. "</th>" ..
 		"<th colspan='2'>" .. lnk('Weekly statistics', 'Weekly') .. "</th><th>" .. lnk('Graphs') .. "</th></tr>\n")
     local bg = ''
@@ -234,6 +235,7 @@ local makeTable = function(web, hosts)
 	local protocol	= status(hosts, k, results, "Protocol")
 	local sanity	= status(hosts, k, results, "URLSanity")
 	local integrity = status(hosts, k, results, "Integrity")
+	local redirects	= status(hosts, k, results, "Redirects")
 	local updated	= status(hosts, k, results, "Updated")
 	local rate	= v.Rate
 	local min	= tonumber(results.speed.min)
@@ -295,7 +297,7 @@ local makeTable = function(web, hosts)
 	end
 
 	web:write("<td>" .. ftp .. "&nbsp;</td><td>" .. http .. "&nbsp;</td><td>" .. https .. "&nbsp;</td><td>" .. rsync .. "&nbsp;</td><td>" .. dns ..
-		    "&nbsp;</td><td>" .. protocol .. "&nbsp;</td><td>" .. sanity .. "&nbsp;</td><td>" .. integrity .. "&nbsp;</td>" .. '<td>' .. rate ..
+		    "&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;<td>" .. graph .. "</td></tr>\n")
 	if "" ~= active then
 	    web:write("<tr><td style='background-color:dimgrey'>" .. active .. "</td></tr>\n")
@@ -361,6 +363,7 @@ if nil == email then C("opening mirrors file - " .. e) else
 	local rsync	= "[skip]"
 	local dns	= DNSrrTest(APT.mirrors, k)
 	local protocol	= status(APT.mirrors, k, results, "Protocol")
+	local redirects	= status(APT.mirrors, k, results, "Redirects")
 	local sanity	= status(APT.mirrors, k, results, "URLSanity")
 	local integrity = status(APT.mirrors, k, results, "Integrity")
 	local updated	= status(APT.mirrors, k, results, "Updated")
-- 
cgit v1.1