aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/apt-panopticon.lua
diff options
context:
space:
mode:
authoronefang2019-12-02 21:32:24 +1000
committeronefang2019-12-02 21:32:24 +1000
commit15dd5767386b3b051d499bef32a2655fb9a21a01 (patch)
tree61a5d5062e51dfb4ce686219b922fbcb1f2e50fa /apt-panopticon.lua
parentTODO+=2 (diff)
downloadapt-panopticon-15dd5767386b3b051d499bef32a2655fb9a21a01.zip
apt-panopticon-15dd5767386b3b051d499bef32a2655fb9a21a01.tar.gz
apt-panopticon-15dd5767386b3b051d499bef32a2655fb9a21a01.tar.bz2
apt-panopticon-15dd5767386b3b051d499bef32a2655fb9a21a01.tar.xz
Make it match test_rewrite.sh more.
Diffstat (limited to '')
-rwxr-xr-xapt-panopticon.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/apt-panopticon.lua b/apt-panopticon.lua
index 5aaa858..ade9de3 100755
--- a/apt-panopticon.lua
+++ b/apt-panopticon.lua
@@ -461,7 +461,8 @@ checkHEAD = function (host, URL, r, retry)
461 end 461 end
462 IP = '--connect-to "' .. pu.host .. '::' .. PU.host .. ':"' 462 IP = '--connect-to "' .. pu.host .. '::' .. PU.host .. ':"'
463 end 463 end
464 local cmd = 'ionice -c3 nice -n 19 curl -I --retry 0 -s --path-as-is --connect-timeout ' .. options.timeout.value .. ' --max-redirs 0 ' .. IP .. ' ' .. '-o /dev/null -D results/"HEADERS_' .. fname .. '" ' .. 464 local cmd = 'ionice -c3 nice -n 19 curl -I --retry 0 -s --path-as-is --connect-timeout ' .. options.timeout.value .. ' --max-redirs 0 ' ..
465 IP .. ' ' .. '-o /dev/null -D results/"HEADERS_' .. fname .. '" ' ..
465 hdr .. ' -w "#%{http_code} %{ssl_verify_result} %{url_effective}\\n" ' .. PU.scheme .. '://' .. host .. PU.path .. ' >>results/"STATUS_' .. fname .. '"' 466 hdr .. ' -w "#%{http_code} %{ssl_verify_result} %{url_effective}\\n" ' .. PU.scheme .. '://' .. host .. PU.path .. ' >>results/"STATUS_' .. fname .. '"'
466 local status, result = execute(cmd) 467 local status, result = execute(cmd)
467 os.execute('cat results/"HEADERS_' .. fname .. '" >>results/"STATUS_' .. fname .. '" 2>/dev/null; rm results/"HEADERS_' .. fname .. '" 2>/dev/null') 468 os.execute('cat results/"HEADERS_' .. fname .. '" >>results/"STATUS_' .. fname .. '" 2>/dev/null; rm results/"HEADERS_' .. fname .. '" 2>/dev/null')
@@ -711,7 +712,7 @@ local postDownload = function(host, r, k)
711end 712end
712 713
713local downloadLock = "flock -n results/curl-" 714local downloadLock = "flock -n results/curl-"
714local download = "curl --connect-timeout " .. options.timeout.value .. " --create-dirs -L -z 'results/stamp.old' -v -R " 715local download = "curl --connect-timeout " .. options.timeout.value .. " --create-dirs -f -L -z 'results/stamp.old' -v -R "
715local downloads = function(host, URL, release, list) 716local downloads = function(host, URL, release, list)
716 if nil == URL then URL = "" end 717 if nil == URL then URL = "" end
717 local lock = "%s-" .. host .. ".lock" 718 local lock = "%s-" .. host .. ".lock"