aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--apt-panopticommon.lua54
-rwxr-xr-xapt-panopticon-report-email-web.lua4
-rwxr-xr-xapt-panopticon-update-data.lua6
-rwxr-xr-xapt-panopticon.lua61
4 files changed, 60 insertions, 65 deletions
diff --git a/apt-panopticommon.lua b/apt-panopticommon.lua
index 53bd674..d9293f6 100644
--- a/apt-panopticommon.lua
+++ b/apt-panopticommon.lua
@@ -424,43 +424,24 @@ APT.testing = function(t, host)
424 return false 424 return false
425end 425end
426 426
427APT.execute = function (s, logit)
428 if nil == logit then logit = true end
429 if logit then D(" executing - &nbsp; <code>" .. s .. "</code>") end
430 --[[ Damn os.execute()
431 Lua 5.1 says it returns "a status code, which is system-dependent"
432 Lua 5.2 says it returns true/nil, "exit"/"signal", the status code.
433 I'm getting 7168 or 0. No idea what the fuck that is.
434 local ok, rslt, status = os.execute(s)
435 ]]
436 local f = io.popen(s .. ' ; echo "$?"', 'r')
437 local status = ""
438 local result = ""
439 -- The last line will be the command's returned status, collect everything else in result.
440 for l in f:lines() do
441 result = result .. status .. "\n"
442 status = l
443 end
444 return status, result
445end
446
447APT.fork = function(s)
448 D(" forking - &nbsp; <code>" .. s .. "</code>")
449 os.execute(s .. " &")
450end
451
452
453APT.exe = function(c) 427APT.exe = function(c)
454 local exe = {status = 0, result = ''} 428 local exe = {status = 0, result = '', log = true, cmd = c .. ' '}
455 exe.cmd = c .. ' '
456 exe.log = false
457 429
458 function exe:log() 430 function exe:log()
459 self.log = true 431 self.log = true
460 return self 432 return self
461 end 433 end
462 function exe:Nice(c) 434 function exe:Nice(c)
463 self.cmd = self.cmd .. 'ionice -c3 nice -n 19 ' .. c .. ' ' 435 if nil == c then
436 self.cmd = 'ionice -c3 nice -n 19 ' .. self.cmd
437 else
438 self.cmd = self.cmd .. 'ionice -c3 nice -n 19 ' .. c .. ' '
439 end
440 return self
441 end
442 function exe:also(c)
443 if nil == c then c = '' else c = ' ' .. c end
444 self.cmd = self.cmd .. ';' .. c .. ' '
464 return self 445 return self
465 end 446 end
466 function exe:And(c) 447 function exe:And(c)
@@ -482,7 +463,12 @@ APT.exe = function(c)
482 return self 463 return self
483 end 464 end
484 function exe:Do() 465 function exe:Do()
485 if self.log then D(" executing - &nbsp; <code>" .. self.cmd .. "</code>") end 466 --[[ "The condition expression of a control structure can return any
467 value. Both false and nil are considered false. All values different
468 from nil and false are considered true (in particular, the number 0
469 and the empty string are also true)."
470 says the docs, I beg to differ.]]
471 if true == self.log then D(" executing - &nbsp; <code>" .. self.cmd .. "</code>") end
486 --[[ Damn os.execute() 472 --[[ Damn os.execute()
487 Lua 5.1 says it returns "a status code, which is system-dependent" 473 Lua 5.1 says it returns "a status code, which is system-dependent"
488 Lua 5.2 says it returns true/nil, "exit"/"signal", the status code. 474 Lua 5.2 says it returns true/nil, "exit"/"signal", the status code.
@@ -491,6 +477,7 @@ APT.exe = function(c)
491 ]] 477 ]]
492 local f = io.popen(self.cmd .. ' ; echo "$?"', 'r') 478 local f = io.popen(self.cmd .. ' ; echo "$?"', 'r')
493 -- The last line will be the command's returned status, collect everything else in result. 479 -- The last line will be the command's returned status, collect everything else in result.
480 self.status = '' -- Otherwise the result starts with 0.
494 for l in f:lines() do 481 for l in f:lines() do
495 self.result = self.result .. self.status .. "\n" 482 self.result = self.result .. self.status .. "\n"
496 self.status = l 483 self.status = l
@@ -500,14 +487,13 @@ APT.exe = function(c)
500 end 487 end
501 function exe:fork() 488 function exe:fork()
502 self.cmd = '{ ' .. self.cmd .. '; } &' 489 self.cmd = '{ ' .. self.cmd .. '; } &'
503 if self.log then D(" forking - &nbsp; <code>" .. self.cmd .. "</code>") end 490 if true == self.log then D(" forking - &nbsp; <code>" .. self.cmd .. "</code>") end
504 os.execute(self.cmd) 491 os.execute(self.cmd)
505 return self 492 return self
506 end 493 end
507 return exe 494 return exe
508end 495end
509 496
510
511APT.checkExes = function (exe) 497APT.checkExes = function (exe)
512 local count = io.popen('ps x | grep "' .. exe .. '" | grep -v " grep " | grep -v "flock -n apt-panopticon.lock " | wc -l'):read("*l") 498 local count = io.popen('ps x | grep "' .. exe .. '" | grep -v " grep " | grep -v "flock -n apt-panopticon.lock " | wc -l'):read("*l")
513 D(count .. " " .. exe .. " commands still running.") 499 D(count .. " " .. exe .. " commands still running.")
@@ -650,7 +636,7 @@ end
650 636
651APT.now = 0 637APT.now = 0
652local status 638local status
653status, APT.now = APT.execute('TZ="GMT" ls -l --time-style="+%s" results/stamp | cut -d " " -f 6-6') 639APT.now = APT.exe('TZ="GMT" ls -l --time-style="+%s" results/stamp | cut -d " " -f 6-6'):Do().result
654APT.now = tonumber(APT.now) 640APT.now = tonumber(APT.now)
655local start = 'now-1month' 641local start = 'now-1month'
656local step = '10min' 642local step = '10min'
diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua
index 67d4d13..3304fb2 100755
--- a/apt-panopticon-report-email-web.lua
+++ b/apt-panopticon-report-email-web.lua
@@ -645,8 +645,8 @@ if nil == web then C("opening mirrors file - " .. e) else
645 "You can get the cgp graphing <a href='https://sledjhamr.org/cgit/apt-panopticon_cgp/about/'>source code here (main repo)</a>" .. 645 "You can get the cgp graphing <a href='https://sledjhamr.org/cgit/apt-panopticon_cgp/about/'>source code here (main repo)</a>" ..
646 "and <a href='https://git.devuan.org/onefang/apt-panopticon_cgp'>here (Devuan repo)</a>.</p>\n" 646 "and <a href='https://git.devuan.org/onefang/apt-panopticon_cgp'>here (Devuan repo)</a>.</p>\n"
647 ) 647 )
648 local status, whn = APT.execute('TZ="GMT" ls -l1 --time-style="+%s" results/stamp | cut -d " " -f 6-6') 648 local whn = APT.exe('TZ="GMT" ls -l1 --time-style="+%s" results/stamp | cut -d " " -f 6-6'):Do().result:sub(2, -2)
649 web:write( "<p>This run took " .. (os.time() - tonumber("0" .. whn:sub(2, -2))) .. " seconds.</p>" .. 649 web:write( "<p>This run took " .. (os.time() - tonumber("0" .. whn)) .. " seconds.</p>" ..
650 "\n</body></html>\n") 650 "\n</body></html>\n")
651 web:close() 651 web:close()
652end 652end
diff --git a/apt-panopticon-update-data.lua b/apt-panopticon-update-data.lua
index a26b11b..8ab9254 100755
--- a/apt-panopticon-update-data.lua
+++ b/apt-panopticon-update-data.lua
@@ -106,9 +106,11 @@ local files = io.popen('ls -d1 results_*')
106for l in files:lines() do 106for l in files:lines() do
107 if ('results_old' ~= l) and ('.tar.xz' ~= l:sub(25, -1)) then 107 if ('results_old' ~= l) and ('.tar.xz' ~= l:sub(25, -1)) then
108 if APT.checkFile(l .. '/stamp') then 108 if APT.checkFile(l .. '/stamp') then
109 local status, whn = APT.execute('TZ="GMT" ls -d1 --time-style="+%s" ' .. l .. ' | cut -d " " -f 6-6') 109-- local status, whn = APT.execute('TZ="GMT" ls -d1 --time-style="+%s" ' .. l .. ' | cut -d " " -f 6-6')
110 local whn = APT.exe('TZ="GMT" ls -d1 --time-style="+%s" ' .. l .. ' | cut -d " " -f 6-6'):Do()
110 whn = whn:sub(2, -2) 111 whn = whn:sub(2, -2)
111 local status, new = APT.execute('TZ="GMT" date -d "' .. whn:sub(9, 18) .. ' ' .. whn:sub(20, 21) .. ':' .. whn:sub(23, 24) .. '" "+%s"') 112-- local status, new = APT.execute('TZ="GMT" date -d "' .. whn:sub(9, 18) .. ' ' .. whn:sub(20, 21) .. ':' .. whn:sub(23, 24) .. '" "+%s"')
113 local new = APT.exe('TZ="GMT" date -d "' .. whn:sub(9, 18) .. ' ' .. whn:sub(20, 21) .. ':' .. whn:sub(23, 24) .. '" "+%s"'):Do()
112 APT.now = tonumber("0" .. new:sub(2, -2)) 114 APT.now = tonumber("0" .. new:sub(2, -2))
113 if 0 ~= APT.now then 115 if 0 ~= APT.now then
114 if APT.checkFile(l .. '/mirrors.lua') then 116 if APT.checkFile(l .. '/mirrors.lua') then
diff --git a/apt-panopticon.lua b/apt-panopticon.lua
index c39a9b9..777fdf3 100755
--- a/apt-panopticon.lua
+++ b/apt-panopticon.lua
@@ -272,15 +272,16 @@ checkHEAD = function (host, URL, r, retry, sanity)
272 end 272 end
273 IP = '--connect-to "' .. pu.host .. '::' .. PU.host .. ':"' 273 IP = '--connect-to "' .. pu.host .. '::' .. PU.host .. ':"'
274 end 274 end
275 local cmd = 'ionice -c3 nice -n 19 curl -I --retry 0 -s --path-as-is --connect-timeout ' .. APT.options.timeout.value .. ' --max-redirs 0 ' .. 275 local status = APT.exe(
276 IP .. ' ' .. '-o /dev/null -D results/"HEADERS_' .. fname .. '" ' .. 276 'curl -I --retry 0 -s --path-as-is --connect-timeout ' .. APT.options.timeout.value .. ' --max-redirs 0 ' ..
277 hdr .. ' -w "#%{http_code} %{ssl_verify_result} %{url_effective}\\n" ' .. PU.scheme .. '://' .. host .. PU.path .. ' >>results/"STATUS_' .. fname .. '"' 277 IP .. ' ' .. '-o /dev/null -D results/"HEADERS_' .. fname .. '" ' ..
278 local status, result = APT.execute(cmd) 278 hdr .. ' -w "#%{http_code} %{ssl_verify_result} %{url_effective}\\n" ' .. PU.scheme .. '://' .. host .. PU.path .. ' >>results/"STATUS_' .. fname .. '"'
279 ):Nice():log():Do().status
279 os.execute('cat results/"HEADERS_' .. fname .. '" >>results/"STATUS_' .. fname .. '" 2>/dev/null; rm -f results/"HEADERS_' .. fname .. '" 2>/dev/null') 280 os.execute('cat results/"HEADERS_' .. fname .. '" >>results/"STATUS_' .. fname .. '" 2>/dev/null; rm -f results/"HEADERS_' .. fname .. '" 2>/dev/null')
280 if "0" ~= status then 281 if 0 ~= status then
281 local msg = curlStatus[0 + status] 282 local msg = curlStatus[status]
282 if nil == msg then msg = "UNKNOWN CURL STATUS CODE!" end 283 if nil == msg then msg = "UNKNOWN CURL STATUS CODE!" end
283 if ("28" == status) or ("7" == status) then 284 if (28 == status) or (7 == status) then
284 if sanity then 285 if sanity then
285 T(" TIMEOUT " .. timeouts + 1 .. ", retry " .. retry + 1, PU.scheme, "URLSanity", host) 286 T(" TIMEOUT " .. timeouts + 1 .. ", retry " .. retry + 1, PU.scheme, "URLSanity", host)
286 else 287 else
@@ -385,7 +386,8 @@ checkHEAD = function (host, URL, r, retry, sanity)
385 local pth = path:match('^(.*/pool/).*$') 386 local pth = path:match('^(.*/pool/).*$')
386 if nil ~= pth then table.insert(APT.results[PU.scheme].redirects, pu.host .. "/" .. pth) else E('Odd redirect path ' .. path) end 387 if nil ~= pth then table.insert(APT.results[PU.scheme].redirects, pu.host .. "/" .. pth) else E('Odd redirect path ' .. path) end
387 I(" Now checking redirected host " .. u) 388 I(" Now checking redirected host " .. u)
388 APT.fork("ionice -c3 nice -n 19 " .. downloadLock .. "REDIR-" .. check .. ".log.txt" .. " ./apt-panopticon.lua " .. extraArgs .. ' ' .. pu.host .. "/" .. path .. " " .. file) 389-- APT.fork("ionice -c3 nice -n 19 " .. downloadLock .. "REDIR-" .. check .. ".log.txt" .. " ./apt-panopticon.lua " .. extraArgs .. ' ' .. pu.host .. "/" .. path .. " " .. file)
390 APT.exe(downloadLock .. "REDIR-" .. check .. ".log.txt" .. " ./apt-panopticon.lua " .. extraArgs .. ' ' .. pu.host .. "/" .. path .. " " .. file):Nice():log():fork()
389 D('logging to ' .. APT.logName(pu.host, nil, file)[2]) 391 D('logging to ' .. APT.logName(pu.host, nil, file)[2])
390 end 392 end
391 end 393 end
@@ -457,7 +459,7 @@ checkHost = function (orig, host, path, ip, file)
457 else 459 else
458 if orig == host then 460 if orig == host then
459 D("checkHost " .. orig .. "" .. file) 461 D("checkHost " .. orig .. "" .. file)
460 APT.fork("ionice -c3 ./apt-panopticon.lua " .. sendArgs .. " -o " .. orig .. path .. " " .. file) 462 APT.exe("./apt-panopticon.lua " .. sendArgs .. " -o " .. orig .. path .. " " .. file):Nice():log():fork()
461 D('logging to ' .. APT.logName(ph.host, nil, file)[2]) 463 D('logging to ' .. APT.logName(ph.host, nil, file)[2])
462 else D("checkHost " .. orig .. " -> " .. host) end 464 else D("checkHost " .. orig .. " -> " .. host) end
463 end 465 end
@@ -492,8 +494,8 @@ local postDownload = function(host, r, k)
492 " results/" .. host .. "/merged/dists/" .. r .. '/' .. k .. ".old" .. 494 " results/" .. host .. "/merged/dists/" .. r .. '/' .. k .. ".old" ..
493 " results/" .. host .. "/merged/dists/" .. r .. '/' .. k .. "; fi") 495 " results/" .. host .. "/merged/dists/" .. r .. '/' .. k .. "; fi")
494 if APT.checkFile('results/' .. host .. '/merged/dists/' .. r .. '/' .. k) then 496 if APT.checkFile('results/' .. host .. '/merged/dists/' .. r .. '/' .. k) then
495 if ".gz" == k:sub(-3, -1) then APT.execute("ionice -c3 nice -n 19 gzip -dfk results/" .. host .. "/merged/dists/" .. r .. '/' .. k, false) end 497 if ".gz" == k:sub(-3, -1) then APT.exe("gzip -dfk results/" .. host .. "/merged/dists/" .. r .. '/' .. k):Nice():noErr():Do() end
496 if ".xz" == k:sub(-3, -1) then APT.execute("ionice -c3 nice -n 19 xz -dfk results/" .. host .. "/merged/dists/" .. r .. '/' .. k .. " 2>/dev/null", false) end 498 if ".xz" == k:sub(-3, -1) then APT.exe("xz -dfk results/" .. host .. "/merged/dists/" .. r .. '/' .. k):Nice():noErr():Do() end
497 end 499 end
498end 500end
499 501
@@ -509,7 +511,7 @@ local downloads = function(host, URL, meta, release, list)
509 local files = 'curl-' .. meta .. '-' .. host .. '.files.txt' 511 local files = 'curl-' .. meta .. '-' .. host .. '.files.txt'
510 local lock = meta .. "-" .. host .. ".log.txt" 512 local lock = meta .. "-" .. host .. ".log.txt"
511 local log = "curl-" .. meta .. "-" .. host .. ".log.txt" 513 local log = "curl-" .. meta .. "-" .. host .. ".log.txt"
512 local cm = "ionice -c3 nice -n 19 " .. downloadLock .. lock .. " " .. download .. log .. " -K results/" .. files 514 local cm = downloadLock .. lock .. " " .. download .. log .. " -K results/" .. files
513 if APT.testing("IPv4") and (not APT.testing("IPv6")) then cm = cm .. ' -4' end 515 if APT.testing("IPv4") and (not APT.testing("IPv6")) then cm = cm .. ' -4' end
514 if (not APT.testing("IPv4")) and APT.testing("IPv6") then cm = cm .. ' -6' end 516 if (not APT.testing("IPv4")) and APT.testing("IPv6") then cm = cm .. ' -6' end
515 f, e = io.open("results/curl-" .. meta .. '-' .. host .. ".files.txt", "a+") 517 f, e = io.open("results/curl-" .. meta .. '-' .. host .. ".files.txt", "a+")
@@ -539,7 +541,7 @@ local downloads = function(host, URL, meta, release, list)
539 end 541 end
540 end 542 end
541 f:close() 543 f:close()
542 APT.fork(cm) 544 APT.exe(cm):Nice():log():fork()
543 D('logging to <a href="' .. log .. '">' .. log .. '</a>, with <a href="' .. files .. '">these files</a>') 545 D('logging to <a href="' .. log .. '">' .. log .. '</a>, with <a href="' .. files .. '">these files</a>')
544end 546end
545 547
@@ -656,12 +658,14 @@ local parseDebs = function(host)
656 local v, p, sz, sha = l:match(' | (.+) | (pool/.+%.deb) | (%d.+) | (%x.+) |') 658 local v, p, sz, sha = l:match(' | (.+) | (pool/.+%.deb) | (%d.+) | (%x.+) |')
657 if nil ~= p then 659 if nil ~= p then
658 if APT.checkFile('results/' .. host .. "/merged/" .. p) then 660 if APT.checkFile('results/' .. host .. "/merged/" .. p) then
659 local status, fsz = APT.execute('ls -l results/' .. host .. "/merged/" .. p .. ' | cut -d " " -f 5-5', false) 661-- local status, fsz = APT.execute('ls -l results/' .. host .. "/merged/" .. p .. ' | cut -d " " -f 5-5', false)
662 local fsz = APT.exe('ls -l results/' .. host .. "/merged/" .. p .. ' | cut -d " " -f 5-5'):Do().result
660 if APT.testing("Integrity") then 663 if APT.testing("Integrity") then
661 if sz ~= fsz:sub(2, -2) then -- The sub bit is to slice off the EOLs at each end. 664 if sz ~= fsz:sub(2, -2) then -- The sub bit is to slice off the EOLs at each end.
662 E('Package size mismatch - results/' .. host .. "/merged/" .. p .. ' should be ' .. sz .. ', but is ' .. fsz:sub(2, -2) .. '.', 'http', 'Integrity', host) 665 E('Package size mismatch - results/' .. host .. "/merged/" .. p .. ' should be ' .. sz .. ', but is ' .. fsz:sub(2, -2) .. '.', 'http', 'Integrity', host)
663 else 666 else
664 local status, fsha = APT.execute('sha256sum results/' .. host .. "/merged/" .. p .. ' | cut -d " " -f 1') 667-- local status, fsha = APT.execute('sha256sum results/' .. host .. "/merged/" .. p .. ' | cut -d " " -f 1')
668 local fsha = APT.exe('sha256sum results/' .. host .. "/merged/" .. p .. ' | cut -d " " -f 1'):Do().result
665 if sha ~= fsha:sub(2, -2) then E('Package SHA256 sum mismatch - results/' .. host .. "/merged/" .. p, 'http', 'Integrity', host) end 669 if sha ~= fsha:sub(2, -2) then E('Package SHA256 sum mismatch - results/' .. host .. "/merged/" .. p, 'http', 'Integrity', host) end
666-- TODO - maybe check the PGP key, though packages are mostly not signed. 670-- TODO - maybe check the PGP key, though packages are mostly not signed.
667 end 671 end
@@ -779,7 +783,8 @@ end
779local parseRelease = function(host) 783local parseRelease = function(host)
780 local list = {inf = 'Release', parser = parsePackages, out = 'Packages', files = {}, nextf = 'debs'} 784 local list = {inf = 'Release', parser = parsePackages, out = 'Packages', files = {}, nextf = 'debs'}
781 local updated = false 785 local updated = false
782 local status, now = APT.execute('TZ="GMT" date "+%s"', false) 786-- local now = APT.execute('TZ="GMT" date "+%s"', false)
787 local now = os.date('!%s')
783 now = tonumber(now:sub(2, -2)) 788 now = tonumber(now:sub(2, -2))
784 for i, n in pairs(releases) do 789 for i, n in pairs(releases) do
785 for l, o in pairs(releaseFiles) do 790 for l, o in pairs(releaseFiles) do
@@ -787,9 +792,9 @@ local parseRelease = function(host)
787 postDownload(host, n, o) 792 postDownload(host, n, o)
788 if (".gpg" == o:sub(-4, -1)) and (APT.checkFile('results/' .. host .. '/merged/dists/' .. n .. '/' .. o)) then 793 if (".gpg" == o:sub(-4, -1)) and (APT.checkFile('results/' .. host .. '/merged/dists/' .. n .. '/' .. o)) then
789 if APT.testing("Integrity") then 794 if APT.testing("Integrity") then
790 local status, out = APT.execute("gpgv --keyring /usr/share/keyrings/devuan-keyring.gpg results/" .. host .. "/merged/dists/" .. n .. '/' .. o .. 795 local status = APT.exe( "gpgv --keyring /usr/share/keyrings/devuan-keyring.gpg results/" .. host .. "/merged/dists/" .. n .. '/' .. o ..
791 " results/" .. host .. "/merged/dists/" .. n .. '/' .. o:sub(1, -5) .. " 2>/dev/null") 796 " results/" .. host .. "/merged/dists/" .. n .. '/' .. o:sub(1, -5)):Nice():noErr():log():Do().status
792 if "0" ~= status then E("GPG check failed - " .. host .. "/merged/dists/" .. n .. '/' .. o, "http", "Integrity", host) end 797 if 0 ~= status then E("GPG check failed - " .. host .. "/merged/dists/" .. n .. '/' .. o, "http", "Integrity", host) end
793-- TODO - should check the PGP sig of InRelease as well. 798-- TODO - should check the PGP sig of InRelease as well.
794 end 799 end
795 os.execute('rm results/' .. host .. '/merged/dists/' .. n .. '/' .. o) 800 os.execute('rm results/' .. host .. '/merged/dists/' .. n .. '/' .. o)
@@ -812,9 +817,11 @@ local parseRelease = function(host)
812 else 817 else
813-- TODO - compare to the pkgmaster copy. 818-- TODO - compare to the pkgmaster copy.
814 if APT.testing('Updated') then 819 if APT.testing('Updated') then
815 local status, pkt = APT.execute([[TZ="GMT" date -d "$(grep '^Date:' results/pkgmaster.devuan.org/merged/dists/]] .. n .. [[/Release.SORTED | cut -d ' ' -f 2-)" '+%s']], false) 820-- local status, pkt = APT.execute([[TZ="GMT" date -d "$(grep '^Date:' results/pkgmaster.devuan.org/merged/dists/]] .. n .. [[/Release.SORTED | cut -d ' ' -f 2-)" '+%s']], false)
821 local pkt = APT.exe([[TZ="GMT" date -d "$(grep '^Date:' results/pkgmaster.devuan.org/merged/dists/]] .. n .. [[/Release.SORTED | cut -d ' ' -f 2-)" '+%s']]):Do().result
816 pkt = tonumber(pkt:sub(2, -2)) 822 pkt = tonumber(pkt:sub(2, -2))
817 local status, new = APT.execute([[TZ="GMT" date -d "$(grep '^Date:' results/]] .. host .. [[/merged/dists/]] .. n .. [[/Release.SORTED | cut -d ' ' -f 2-)" '+%s']], false) 823-- local status, new = APT.execute([[TZ="GMT" date -d "$(grep '^Date:' results/]] .. host .. [[/merged/dists/]] .. n .. [[/Release.SORTED | cut -d ' ' -f 2-)" '+%s']], false)
824 local new = APT.exe([[TZ="GMT" date -d "$(grep '^Date:' results/]] .. host .. [[/merged/dists/]] .. n .. [[/Release.SORTED | cut -d ' ' -f 2-)" '+%s']]):Do().result
818 new = tonumber(new:sub(2, -2)) 825 new = tonumber(new:sub(2, -2))
819 local upd = pkt + APT.mirrors[host].Updated 826 local upd = pkt + APT.mirrors[host].Updated
820 local updd = pkt + (APT.mirrors[host].Updated * 1.5) -- Give the mirror time to actually do the update. 827 local updd = pkt + (APT.mirrors[host].Updated * 1.5) -- Give the mirror time to actually do the update.
@@ -883,7 +890,7 @@ local doDownloads = function(host, path, list)
883 890
884Mon Dec 23 01:02:54 2019 DEBUG : forking 891Mon Dec 23 01:02:54 2019 DEBUG : forking
885 892
886ionice -c3 nice -n 19 flock -n results/curl-debs-pkgmaster.devuan.org.log curl --connect-timeout 5 --create-dirs -f -L --fail-early --max-time 300 --retry 3 -R -v -z 'results/stamp.old' --stderr results/curl-debs-pkgmaster.devuan.org.log -K results/curl-debs-pkgmaster.devuan.org.files 893flock -n results/curl-debs-pkgmaster.devuan.org.log curl --connect-timeout 5 --create-dirs -f -L --fail-early --max-time 300 --retry 3 -R -v -z 'results/stamp.old' --stderr results/curl-debs-pkgmaster.devuan.org.log -K results/curl-debs-pkgmaster.devuan.org.files
887 894
888 895
889Mon Dec 23 01:02:54 2019 DEBUG : 0 flock -n results/curl-debs-pkgmaster.devuan.org.log commands still running. 896Mon Dec 23 01:02:54 2019 DEBUG : 0 flock -n results/curl-debs-pkgmaster.devuan.org.log commands still running.
@@ -998,17 +1005,17 @@ if 0 < #arg then
998 if "table" == type(v) then 1005 if "table" == type(v) then
999 for k1, v1 in pairs(v) do 1006 for k1, v1 in pairs(v) do
1000 if v1 == "A" then 1007 if v1 == "A" then
1001 if APT.testing("IPv4") then APT.fork("ionice -c3 ./apt-panopticon.lua " .. sendArgs .. " " .. pu.host .. path .. " " .. k1 .. " " .. file) end 1008 if APT.testing("IPv4") then APT.exe("./apt-panopticon.lua " .. sendArgs .. " " .. pu.host .. path .. " " .. k1 .. " " .. file):Nice():log():fork() end
1002 elseif v1 == "AAAA" then 1009 elseif v1 == "AAAA" then
1003 if APT.testing("IPv6") then APT.fork("ionice -c3 ./apt-panopticon.lua " .. sendArgs .. " " .. pu.host .. path .. " " .. k1 .. " " .. file) end 1010 if APT.testing("IPv6") then APT.exe("./apt-panopticon.lua " .. sendArgs .. " " .. pu.host .. path .. " " .. k1 .. " " .. file):Nice():log():fork() end
1004 end 1011 end
1005 D('logging to ' .. APT.logName(pu.host, k1, file)[2]) 1012 D('logging to ' .. APT.logName(pu.host, k1, file)[2])
1006 end 1013 end
1007 else 1014 else
1008 if v == "A" then 1015 if v == "A" then
1009 if APT.testing("IPv4") then APT.fork("ionice -c3 ./apt-panopticon.lua " .. sendArgs .. " " .. pu.host .. path .. " " .. k .. " " .. file) end 1016 if APT.testing("IPv4") then APT.exe("./apt-panopticon.lua " .. sendArgs .. " " .. pu.host .. path .. " " .. k .. " " .. file):Nice():log():fork() end
1010 elseif v == "AAAA" then 1017 elseif v == "AAAA" then
1011 if APT.testing("IPv6") then APT.fork("ionice -c3 ./apt-panopticon.lua " .. sendArgs .. " " .. pu.host .. path .. " " .. k .. " " .. file) end 1018 if APT.testing("IPv6") then APT.exe("./apt-panopticon.lua " .. sendArgs .. " " .. pu.host .. path .. " " .. k .. " " .. file):Nice():log():fork() end
1012 end 1019 end
1013 D('logging to ' .. APT.logName(pu.host, k, file)[2]) 1020 D('logging to ' .. APT.logName(pu.host, k, file)[2])
1014 end 1021 end
@@ -1212,7 +1219,7 @@ os.execute('sleep 1') -- Wait for things to start up before checking for them.
1212 for n, r in pairs(APT.options.reports.value) do 1219 for n, r in pairs(APT.options.reports.value) do
1213 if APT.checkFile("apt-panopticon-report-" .. r .. ".lua") then 1220 if APT.checkFile("apt-panopticon-report-" .. r .. ".lua") then
1214 I("Creating " .. r .. " report.") 1221 I("Creating " .. r .. " report.")
1215 APT.execute("./apt-panopticon-report-" .. r .. ".lua " .. sendArgs) 1222 APT.exe("./apt-panopticon-report-" .. r .. ".lua " .. sendArgs):log():Do()
1216 end 1223 end
1217 end 1224 end
1218 1225