Major refactor, especially of the downloading and processing code.

Make the code more readable, less scattered.
Use a coroutine to multitask better.
Plugable functions for parsing the download results, and figuring out
what to download next.
Track timeouts at a finer level.
Dig for IPs in the forked apt-panopticons, not all at once at the
beginning.

Various cleanups and tweaks.

1 files changed, 28 insertions, 3 deletions

diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua
index 8a5404a..c52b6c0 100755
--- a/apt-panopticon-report-email-web.lua
+++ b/apt-panopticon-report-email-web.lua
@@ -3,6 +3,7 @@
 local APT = require 'apt-panopticommon'
 local D = APT.D
 local I = APT.I
+local T = APT.T
 local W = APT.W
 local E = APT.E
 local C = APT.C
@@ -47,16 +48,19 @@ local status = function(host, results, typ)
     local result = ""
     local e = 0
     local w = 0
+    local t = 0
     local s = nil ~= APT.mirrors[host].Protocols[typ]
     local to = results.timeout
     if not APT.search(APT.protocols, typ) then s = true end
     if nil ~= results[typ] then
         e = results[typ].errors
         w = results[typ].warnings
+        t = results[typ].timeouts
         for k, v in pairs(results[typ]) do
             if "table" == type(v) then
                 if 0 <= v.errors   then e = e + v.errors   else to = true end
                 if 0 <= v.warnings then w = w + v.warnings else to = true end
+                if 0 <= v.timeouts then t = t + v.timeouts else to = true end
             end
         end
     else
@@ -67,6 +71,7 @@ local status = function(host, results, typ)
                         if typ == i then
                             if 0 <= u.errors   then e = e + u.errors   end
                             if 0 <= u.warnings then w = w + u.warnings end
+                            if 0 <= u.timeouts then t = t + u.timeouts end
                         end
                     end
                 end
@@ -99,6 +104,21 @@ local status = function(host, results, typ)
         else
             faulty = faulty .. host .. " (" .. typ .. ")\n"
         end
+    elseif 0 < t then
+        result = "[timeout"
+        if not s then result = result .. "*" end
+        if APT.html then
+            if s then
+                result = "[<font color='blue'><b>timeout</b></font>"
+            else
+                result = "[<font color='darkblue'><b>timeout*</b></font>"
+            end
+        end
+        if APT.html then
+            faulty = faulty .. host .. " (" .. typ .. ")<br>\n"
+        else
+            faulty = faulty .. host .. " (" .. typ .. ")\n"
+        end
     else
         result = "[OK"
         if not s then result = result .. "*" end
@@ -110,7 +130,7 @@ local status = function(host, results, typ)
             end
         end
     end
-    return result .. APT.plurals(e, w) .. "]"
+    return result .. APT.plurals(e, w, t) .. "]"
 end
 
 local m = {}
@@ -125,9 +145,11 @@ local logCount = function(domain, ip)
     if nil ~= rfile then
         local errors = 0
         local warnings = 0
+        local timeouts = 0
         for l in rfile:lines() do
             if nil ~= l:match("><b>ERROR ") then errors = errors + 1 end
             if nil ~= l:match("><b>WARNING ") then warnings = warnings + 1 end
+            if nil ~= l:match("><b>TIMEOUT ") then timeouts = timeouts + 1 end
         end
         rfile:close()
         if APT.html then
@@ -137,7 +159,7 @@ local logCount = function(domain, ip)
                 log = "<a href='" .. nm .. "'>" .. ip .. "</a>"
             end
         end
-        log = log .. APT.plurals(errors, warnings)
+        log = log .. APT.plurals(errors, warnings, timeouts)
     end
     return log
 end
@@ -303,8 +325,11 @@ if nil == web then C("opening mirrors file - " .. e) else
                 " means the tested thing is supported for that mirror.</p>\n" ..
                 "<p>[<font color='darkred'><b>FAILED*</b></font>] or [<font color='darkgreen'><b>OK*</b></font>]" ..
                 " means the tested thing is unsupported for that mirror, but might have been tested anyway.</p>\n" ..
+                "<p>[<font color='blue'><b>timeout</b></font>] or [<font color='darkblue'><b>timeout</b></font>]" ..
+                " 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 server had too many timeouts, and tests where aborted, so there is no result for this test.</p>" ..
+                " 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>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>\n" ..