A lot of tweaking of the logging and reporting, making it easier to read.

1 files changed, 9 insertions, 9 deletions

diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua
index 97f7cef..05699ee 100755
--- a/apt-panopticon-report-email-web.lua
+++ b/apt-panopticon-report-email-web.lua
@@ -213,7 +213,7 @@ 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('Updated') .. "</th><th colspan='2'>" .. lnk('Speed range', 'Speed') .. "</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 = ''
     for k, v in APT.orderedPairs(hosts) do
@@ -235,13 +235,13 @@ local makeTable = function(web, hosts)
         local sanity    = status(hosts, k, results, "URLSanity")
         local integrity = status(hosts, k, results, "Integrity")
         local updated   = status(hosts, k, results, "Updated")
-        local rate = v.Rate
-        if nil ~= rate then updated = updated .. ' ' .. rate end
+        local rate      = v.Rate
         local min       = tonumber(results.speed.min)
         local max       = tonumber(results.speed.max)
         local spd       = '<td></td><td></td>'
-        local week      = '<td></td><td></td>'
+        local week      = '<td>&nbsp;</td><td>&nbsp;</td>'
         local graph     = '<a href="../apt-panopticon_cgp/host.php?h=' .. k .. '">graphs</a>'
+        if nil == rate then rate = '' end
 
         -- DNS-RR test.
         if (APT.options.roundRobin.value ~= k) and (nil ~= hosts[APT.options.roundRobin.value]) then
@@ -291,12 +291,12 @@ local makeTable = function(web, hosts)
                 if '0.00' == percentUp then percentUpdated = '??' end   -- We are counting errors, and you can't get an error if you can't check anything.
                                                                         -- TODO - try to account for this better, this is just a quick hack.
             end
-            week = '<td>' .. percentUp .. '% up</td><td>' .. percentUpdated .. '% updated</td>'
+            week = '<td>&nbsp;' .. percentUp .. '% up</td><td>&nbsp;' .. percentUpdated .. '% updated</td>'
         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>" .. updated .. 
-                    "&nbsp;" .. spd .. "&nbsp;" .. week .."&nbsp;<td>" .. graph .. "</td></tr>\n")
+                    "&nbsp;</td><td>" .. protocol .. "&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")
         end
@@ -482,7 +482,7 @@ if nil == web then C("opening mirrors file - " .. e) else
                 " means the mirror had some timeouts, and tests where not yet aborted.  The darker colour means unsupported by the mirror, but tested anyway.</p>" ..
                 "<p><font color='blue'><b>TIMEOUT</b></font> or <font color='darkblue'><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.</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>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; " ..
                 APT.options.roundRobin.value .. " is the DNS-RR itself, so it doesn't get tested directly.</p>\n" ..
@@ -497,7 +497,7 @@ if nil == web then C("opening mirrors file - " .. e) else
 
     m = makeIPlist(APT.mirrors)
     web:write(  "<p>This lists each mirror, and the DNS entries for that mirror. &nbsp; " ..
-                "The links point to the testing log files for " .. logCount("apt-panopticon") .. " for each domain name / IP combination that was tested. &nbsp; " ..
+                "The links point to the testing log files (" .. logCount("apt-panopticon") .. ") for each domain name / IP combination that was tested. &nbsp; " ..
                 "If a mirror has a CNAME, that CNAME is listed along with that CNAMEs DNS entries. &nbsp; " ..
                 APT.options.roundRobin.value .. " is the DNS round robin, which points to the mirrors that are part of the DNS-RR. &nbsp; " ..
                 "If an IP is part of the DNS-RR, it is marked with '<font color='purple'><b>DNS-RR</b></font>' &nbsp; " ..