1 files changed, 26 insertions, 10 deletions
diff --git a/apt-panopticon-report-web.lua b/apt-panopticon-report-web.lua
index 61102c8..fb41341 100755
--- a/apt-panopticon-report-web.lua
+++ b/apt-panopticon-report-web.lua
@@ -155,24 +155,27 @@ local status = function(host, results, typ)
    local e = 0
    local w = 0
    local s = nil ~= mirrors[host].Protocols[typ]
+    local to = false
    if ('http' ~= typ) and ('https' ~= typ) and ('ftp' ~= typ) and ('rsync' ~= typ) then s = true end
    if nil ~= results[typ] then
        e = results[typ].errors
        w = results[typ].warnings
+--[[
        for k, v in pairs(results[typ]) do
            if "table" == type(v) then
-                e = e + v.errors
+                if 0 <= v.errors   then e = e + v.errors   else to = true end
-                w = w + v.warnings
+                if 0 <= v.warnings then w = w + v.warnings else to = true end
            end
        end
+]]
    else
        for k, v in pairs(results) do
            if "table" == type(v) then
                for i, u in pairs(v) do
                    if "table" == type(u) then
                        if typ == i then
-                            e = e + u.errors
+                            if 0 <= u.errors   then e = e + u.errors   else to = true end
-                            w = w + u.warnings
+                            if 0 <= u.warnings then w = w + u.warnings else to = true end
                        end
                    end
                end
@@ -180,18 +183,24 @@ local status = function(host, results, typ)
        end
    end
-    if 0 < e then
+    if to then
+        if s then
+            result = "[<font color='blue'><b>TIMEOUT</b></font>]"
+        else
+            result = "[<font color='darkblue'><b>TIMEOUT *</b></font>]"
+        end
+    elseif 0 < e then
        if s then
            result = "[<font color='red'><b>FAILED</b></font>]"
        else
-            result = "[<font color='darkred'><b>FAILED</b></font>]"
+            result = "[<font color='darkred'><b>FAILED *</b></font>]"
        end
        faulty = faulty .. host .. " (" .. typ .. ")<br>\n"
    else
        if s then
            result = "[<font color='lime'><b>OK</b></font>]"
        else
-            result = "[<font color='darkgreen'><b>OK</b></font>]"
+            result = "[<font color='darkgreen'><b>OK *</b></font>]"
        end
    end
    return result .. plurals(e, w)
@@ -258,7 +267,7 @@ end
 local file, e = io.open("results/Report-web.html", "w+")
 if nil == file then C("opening mirrors file - " .. e) else
    file:write( "<html><head><title>apt-panopticon results</title>\n" ..
-                '</head><body bgcolor="black" text="white" alink="red" link="blue" vlink="purple">' ..
+                '</head><body bgcolor="black" text="white">' ..
                "<h1>Welcome to the apt-panopticon results page.</h1>\n" ..
                "<p>This is the status of the mirror servers in the Devuan package mirror network.</p>\n" ..
                "<p>The full list of Devuan package mirrors is available at the URL: " ..
@@ -269,21 +278,25 @@ if nil == file then C("opening mirrors file - " .. e) else
                "<p>[<font color='red'><b>FAILED</b></font>] or [<font color='lime'><b>OK</b></font>]" ..
                " 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>]" ..
+                "<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 server had too many timeouts, and tests where aborted, so there is no result for this test.</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" ..
                "<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.</p>\n" ..
+                "<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>\n" ..
                "<p>[<font color='grey'><b>skip</b></font>] means that the test hasn't been written yet.</p>\n" ..
                "<tr><th></th><th>FTP</th><th>HTTP</th><th>HTTPS</th><th>RSYNC</th><th>DNS round robin</th><th>Protocol</th><th>URL sanity</th><th>Integrity</th><th>Updated</th></tr>\n"
                )
    for k, v in orderedPairs(mirrors) do
        local results = loadfile("results/" .. k .. ".lua")()
+        local active = ""
        if "yes" == v.Active then
            file:write("     <tr><th>" .. k .. "</th> ")
        else
+            if nil == v.Active then active = 'nil' else active = v.Active end
            file:write("     <tr style='background-color:dimgrey'><th>" .. k .. "</th> ")
        end
        local IPs = v.IPs
@@ -343,6 +356,9 @@ if nil == file then C("opening mirrors file - " .. e) else
        file: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 .. "</td></tr>\n")
+        if "" ~= v.Active then
+            file:write("<tr><td style='background-color:dimgrey'>" .. active .. "</td></tr>\n")
+        end
    end
    file:write( "</table>\n<br>\n<h2>==== faulty mirrors: ====</h2>\n" .. faulty)
    file:write( "<br>\n<br>\n<h2>==== DNS and logs: ====</h2>\n")