lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Print some debug output

Browse source
This commit is contained in:
Eelco Dolstra 2012-07-17 16:19:40 -04:00
parent 04559a0d45
commit a6f348599c
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
scripts/download-from-binary-cache.pl.in
View file

@ -18,6 +18,8 @@ my @binaryCacheUrls = map { s/\/+$//; $_ } split(/ /,
my $maxParallelRequests = int($Nix::Config::config{"binary-caches-parallel-connections"} // 150); my $maxParallelRequests = int($Nix::Config::config{"binary-caches-parallel-connections"} // 150);
$maxParallelRequests = 1 if $maxParallelRequests < 1; $maxParallelRequests = 1 if $maxParallelRequests < 1;
my $debug = ($ENV{"NIX_DEBUG_SUBST"} // "") eq 1;
my ($dbh, $insertNAR, $queryNAR, $insertNARExistence, $queryNARExistence); my ($dbh, $insertNAR, $queryNAR, $insertNARExistence, $queryNARExistence);
my %cacheIds; my %cacheIds;
@ -34,7 +36,7 @@ sub addRequest {
my $curl = WWW::Curl::Easy->new; my $curl = WWW::Curl::Easy->new;
my $curlId = $curlIdCount++; my $curlId = $curlIdCount++;
$requests{$curlId} = { storePath => $storePath, url => $url, handle => $curl, content => "" }; $requests{$curlId} = { storePath => $storePath, url => $url, handle => $curl, content => "", type => $head ? "HEAD" : "GET" };
$curl->setopt(CURLOPT_PRIVATE, $curlId); $curl->setopt(CURLOPT_PRIVATE, $curlId);
$curl->setopt(CURLOPT_URL, $url); $curl->setopt(CURLOPT_URL, $url);
@ -68,12 +70,15 @@ sub processRequests {
if ($curlm->perform() != $activeRequests) { if ($curlm->perform() != $activeRequests) {
while (my ($id, $result) = $curlm->info_read) { while (my ($id, $result) = $curlm->info_read) {
if ($id) { if ($id) {
my $handle = $requests{$id}->{handle}; my $request = $requests{$id} or die;
$requests{$id}->{result} = $result; my $handle = $request->{handle};
$requests{$id}->{httpStatus} = $handle->getinfo(CURLINFO_HTTP_CODE); $request->{result} = $result;
#print STDERR "\nRequest completed ($id, $result, $requests{$id}->{httpStatus})\n"; $request->{httpStatus} = $handle->getinfo(CURLINFO_HTTP_CODE);
print STDERR "$request->{type} on $request->{url} [$request->{result}, $request->{httpStatus}]\n" if $debug;
$activeRequests--; $activeRequests--;
delete $requests{$id}->{handle}; delete $request->{handle};
if (scalar(keys %scheduled) > 0) { if (scalar(keys %scheduled) > 0) {
my $id2 = (keys %scheduled)[0]; my $id2 = (keys %scheduled)[0];
@ -81,7 +86,6 @@ sub processRequests {
$activeRequests++; $activeRequests++;
delete $scheduled{$id2}; delete $scheduled{$id2};
} }
} }
} }
} }
@ -189,7 +193,10 @@ sub processNARInfo {
my $compression = "bzip2"; my $compression = "bzip2";
my @refs; my @refs;
foreach my $line (split "\n", $request->{content}) { foreach my $line (split "\n", $request->{content}) {
$line =~ /^(.*): (.*)$/ or return undef; unless ($line =~ /^(.*): (.*)$/) {
print STDERR "bad NAR info file ‘$request->{url}’\n";
return undef;
}
if ($1 eq "StorePath") { $storePath2 = $2; } if ($1 eq "StorePath") { $storePath2 = $2; }
elsif ($1 eq "URL") { $url = $2; } elsif ($1 eq "URL") { $url = $2; }
elsif ($1 eq "Compression") { $compression = $2; } elsif ($1 eq "Compression") { $compression = $2; }