Add timeouts tracking.

1 files changed, 33 insertions, 1 deletions

diff --git a/apt-panopticon-update-data.lua b/apt-panopticon-update-data.lua
index 57eddd9..ceef7f3 100755
--- a/apt-panopticon-update-data.lua
+++ b/apt-panopticon-update-data.lua
@@ -11,6 +11,35 @@ local arg, sendArgs = APT.parseArgs({...})
 
 local oldest = 0
 
+local fixResults = function(f)
+    if APT.checkFile(f) then
+        local results = loadfile(f)()
+        results = APT.padResults(results)
+        for i, w in pairs(APT.protocols) do
+            tests = results[w]
+            if nil ~= tests.Redirects then
+                tests.redirects = tests.Redirects
+                tests.Redirects = nil
+            elseif nil == tests.redirects then
+                tests.redirects = {}
+            end
+            results[w] = tests
+        end
+        if nil ~= results.Redirects then
+            for i, w in pairs(APT.protocols) do
+                results[w].redirects  = results.Redirects
+            end
+            results.Redirects = nil
+        end
+        local rfile, e = io.open(f, "w+")
+        if nil == rfile then C("opening results file - " .. e) else
+            rfile:write(APT.dumpTable(results, "", "results") .. "\nreturn results\n")
+            rfile:close()
+        end
+    end
+end
+
+
 local lock = 'apt-panopticon.lock'
 while APT.checkFile(lock) do os.execute('sleep 10') end
 os.execute('touch ' .. lock)
@@ -53,7 +82,6 @@ for l in files:lines() do
             local f = l:sub(1, -8) .. "/" .. k .. ".lua"
             if APT.checkFile(f) then
                 results = loadfile(f)()
-                results = APT.padResults(results)
                 results['IPs'] = v.IPs
                 local rfile, e = io.open(f, "w+")
                 if nil == rfile then C("opening results file - " .. e) else
@@ -63,6 +91,10 @@ for l in files:lines() do
             end
         end
     end
+    local fls = io.popen('ls -1 ' .. lsub .. '/*.lua 2>/dev/null')
+    for k in fls:lines() do
+        fixResults(k)
+    end
 end