1 files changed, 60 insertions, 15 deletions
diff --git a/apt-panopticommon.lua b/apt-panopticommon.lua
index 0862b77..e31c22f 100644
--- a/apt-panopticommon.lua
+++ b/apt-panopticommon.lua
@@ -3,14 +3,18 @@ local APT = {}
 -- https://oss.oetiker.ch/rrdtool/prog/rrdlua.en.html
 APT.rrd = require 'rrd'
+APT.version = '0.3 alpha'
 APT.protocols = {"ftp", "http", "https", "rsync"}
 APT.tests = {'raw', 'Integrity', 'Protocol', 'Redirects', 'Updated', 'URLSanity', 'Speed'}
-APT.releases = {"ascii", "beowulf", "chimaera", "ceres"}
+--APT.releases = {"jessie", "ascii", "beowulf", "chimaera", "daedalus", "ceres"}
+APT.releases = {"beowulf","chimaera", "daedalus", "excalibur", "ceres"}
 APT.subRels = {'backports', 'proposed-updates', 'security', 'updates'}
 APT.notExist =
 {
-    'chimaera-backports',
+    'excalibur-backports',
-    'chimaera-security',
+    'excalibur-security',
+    'excalibur-updates',
    'ceres-backports',          -- These will never exist, it's our code name for the testing suite.
    'ceres-proposed-updates',
    'ceres-updates',
@@ -50,6 +54,12 @@ APT.options =
            help = "The round robin DNS name.",
            value = "deb.devuan.org",
        },
+    roundRobinCname =
+        {
+            typ = "string",
+            help = "The round robin DNS name.",
+            value = "deb.rr.devuan.org",
+        },
    tests =
        {
            typ = "table",
@@ -125,7 +135,7 @@ APT.parseArgs = function(args)
    local arg = {}
    local sendArgs = ""
    -- A special test to disable IPv6 tests if IPv6 isn't available.
-    if 1 == APT.exe('ip -6 addr | grep inet6 | grep " global"'):Do().status then
+    if 1 == APT.exe('ip -6 addr | grep inet6 | grep " global"'):timeout():Do().status then
        table.insert(args, '--tests=-IPv6')
    end
    if 0 ~= #(args) then
@@ -139,7 +149,7 @@ APT.parseArgs = function(args)
                end
                os.exit()
            elseif "--version" == a then
-                print("apt-panopticon version 0.2 alpha")
+                print("apt-panopticon version " .. APT.version)
                os.exit()
            elseif "-v" == a then
                APT.verbosity = APT.verbosity + 1
@@ -398,7 +408,7 @@ APT.logOpen = function(host, a2, a3)
    local name = APT.logName(host, a2, a3)[1]
    if APT.checkFile(name) then return false end
    APT.logFile, e = io.open(name, "a+")
-    if nil == APT.logFile then C('opening log file (' .. name .. ') - ' .. e); return false end
+    if nil == APT.logFile then print('CRITICAL - opening log file (' .. name .. ') - ' .. e); return false end
    if nil ~= APT.logFile then
        APT.logFile:write("<html><head>\n")
        APT.logFile:write("</head><body bgcolor='black' text='white' alink='red' link='aqua' vlink='fuchsia'>\n")
@@ -415,6 +425,7 @@ APT.logPost = function()
    if nil ~= APT.logFile then
        APT.logFile:write("</body></html> \n")
        APT.logFile:close()
+        APT.logFile = nil
    end
 end
@@ -455,7 +466,7 @@ local log = function(v, t, s, prot, test, host)
    if nil ~= APT.logFile then
        if APT.html then
            local colour = "white"
-            if -1 == v then colour = "fuchsia" end      -- CRITICAL
+            if -1 == v then colour = "fuchsia"; print(t .. " " .. s) end        -- CRITICAL
            if  0 == v then colour = "red    " end      -- ERROR
            if  1 == v then colour = "yellow " end      -- WARNING
            if  2 == v then colour = "blue   " end      -- TIMEOUT
@@ -482,6 +493,17 @@ local E = APT.E
 local C = APT.C
+APT.readCmd = function(cmd)
+    local result = {}
+    local output = io.popen(cmd)
+    if nil ~= output then
+        for l in output:lines() do
+            table.insert(result, l)
+        end
+    end
+    return result
+end
 APT.debians = {}
 APT.mirrors = {}
@@ -508,7 +530,7 @@ APT.tested = function(prot, test, host)
 end
 APT.exe = function(c)
-    local exe = {status = 0, result = '', log = true, cmd = c .. ' '}
+    local exe = {status = 0, result = '', log = true, cmd = c .. ' ', command = c}
    function exe:log()
        self.log = true
@@ -522,6 +544,16 @@ APT.exe = function(c)
        end
        return self
    end
+    function exe:timeout(c)
+        -- timeout returns a status of - command status if --preserve-status; "128+9" (actually 137) if --kill-after ends up being done; 124 if it had to TERM; command status if all went well.
+        -- --kill-after means "send KILL after TERM fails.
+        if nil == c then
+            self.cmd = 'timeout --kill-after=10.0 --foreground 42.0s ' .. self.cmd
+        else
+            self.cmd = 'timeout --kill-after=10.0 --foreground ' .. c .. ' ' .. self.cmd
+        end
+        return self
+    end
    function exe:also(c)
        if nil == c then c = '' else c = ' ' .. c end
        self.cmd = self.cmd .. ';' .. c .. ' '
@@ -558,17 +590,28 @@ APT.exe = function(c)
            I'm getting 7168 or 0.  No idea what the fuck that is.
        local ok, rslt, status = os.execute(s)
        ]]
-        local f = io.popen(self.cmd .. ' ; echo "$?"', 'r')
+        local f = APT.readCmd(self.cmd, 'r')
        -- The last line will be the command's returned status, collect everything else in result.
        self.status = ''        -- Otherwise the result starts with 0.
-        for l in f:lines() do
+        self.result = '\n'
-            self.result = self.result .. self.status .. "\n"
+        for i,l in ipairs(f) do
-            self.status = l
+            self.result = self.result .. l .. "\n"
+        end
+        f = APT.readCmd('echo "$?"', 'r')
+        for i,l in ipairs(f) do
+            self.status = tonumber(l)
+            if (137 == self.status) or (124 == self.status) then
+                print("timeout killed " .. self.status .. ' ' .. self.command)
+                E("timeout killed " .. self.status .. ' ' .. self.command)
+            elseif (0 ~= self.status) then
+                print("status |" .. self.status .. '| ' .. self.command)
+                E("status |" .. self.status .. '| ' .. self.command)
+            end
        end
-        self.status = tonumber(self.status)
        return self
    end
-    function exe:fork()
+    function exe:fork(host)
+        if nil ~= host then self.cmd = self.cmd .. ';  r=$?; if [ $r -ge 124 ]; then echo "$r ' .. host .. ' failed forked command ' .. string.gsub(self.cmd, '"', "'") .. '"; fi' end
        self.cmd = '{ ' .. self.cmd .. '; } &'
        if true == self.log then D("  forking - &nbsp; <code>" .. self.cmd .. "</code>") end
        os.execute(self.cmd)
@@ -578,7 +621,9 @@ APT.exe = function(c)
 end
 APT.checkExes = function (exe)
-    local count = io.popen('ps x | grep "' .. exe .. '" | grep -v " grep " | grep -v "flock -n apt-panopticon.lock " | wc -l'):read("*l")
+    local count = 0
+    local ps = io.popen('ps x | grep "' .. exe .. '" | grep -v " grep " | grep -v "flock -n apt-panopticon.lock " | wc -l')
+    if nil ~= ps then count = ps:read("*l") end
    D(count .. " " .. exe .. " commands still running.")
    return tonumber(count)
 end