mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-06 11:23:45 +00:00
Cosmetics in writing and parsing log-file after test
'check_accessible_urls'
This commit is contained in:
parent
6e7a795ed1
commit
271d4397bb
@ -61,7 +61,8 @@ sub check_http_url($$$$) {
|
|||||||
print $fe " " . $response->status_line . ": ";
|
print $fe " " . $response->status_line . ": ";
|
||||||
return 3;
|
return 3;
|
||||||
}
|
}
|
||||||
my @title = ();
|
my @atitle = ();
|
||||||
|
my %htitle = ();
|
||||||
my $res = 0;
|
my $res = 0;
|
||||||
while ($buf =~ s/\<title\>([^\<]*)\<\/title\>//i) {
|
while ($buf =~ s/\<title\>([^\<]*)\<\/title\>//i) {
|
||||||
my $title = $1;
|
my $title = $1;
|
||||||
@ -69,13 +70,17 @@ sub check_http_url($$$$) {
|
|||||||
$title =~ s/ +/ /g;
|
$title =~ s/ +/ /g;
|
||||||
$title =~ s/^ //;
|
$title =~ s/^ //;
|
||||||
$title =~ s/ $//;
|
$title =~ s/ $//;
|
||||||
push(@title, $title);
|
if (! defined($htitle{$title})) {
|
||||||
print $fe "title = \"$title\": ";
|
push(@atitle, $title);
|
||||||
|
$htitle{$title} = 1;
|
||||||
|
}
|
||||||
if ($title =~ /Error 404|Not Found/) {
|
if ($title =~ /Error 404|Not Found/) {
|
||||||
print $fe " Page reports 'Not Found' from \"$protocol://$host$getp\": ";
|
print $fe " Page reports 'Not Found' from \"$protocol://$host$getp\": ";
|
||||||
$res = 3;
|
$res = 3;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
print $fe "title = \"" . join(': ', @atitle) . "\": ";
|
||||||
return $res;
|
return $res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -161,13 +161,17 @@ else {
|
|||||||
|
|
||||||
print "Using tempdir \"" . abs_path($tempdir) . "\"\n";
|
print "Using tempdir \"" . abs_path($tempdir) . "\"\n";
|
||||||
|
|
||||||
my @wait = ();
|
my %wait = ();
|
||||||
for (my $i = 0; $i < $NR_JOBS; $i++) { # Number of subprocesses
|
for (my $i = 0; $i < $NR_JOBS; $i++) { # Number of subprocesses
|
||||||
my $pid = fork();
|
my $pid = fork();
|
||||||
if ($pid == 0) {
|
if ($pid > 0) {
|
||||||
|
$wait{$pid} = $i;
|
||||||
|
}
|
||||||
|
elsif ($pid == 0) {
|
||||||
|
|
||||||
# I am child
|
# I am child
|
||||||
open(my $fe, '>:encoding(UTF-8)', "$tempdir/xxxError$i");
|
open(my $fe, '>:encoding(UTF-8)', "$tempdir/xxxError$i");
|
||||||
|
my $subprocess = $i;
|
||||||
open(my $fs, '>:encoding(UTF-8)', "$tempdir/xxxSum$i");
|
open(my $fs, '>:encoding(UTF-8)', "$tempdir/xxxSum$i");
|
||||||
while (1) {
|
while (1) {
|
||||||
open(my $fh, '+<', $countfile) or die("cannot open $countfile");
|
open(my $fh, '+<', $countfile) or die("cannot open $countfile");
|
||||||
@ -195,7 +199,7 @@ for (my $i = 0; $i < $NR_JOBS; $i++) { # Number of subprocesses
|
|||||||
my $u = $rentry->{u};
|
my $u = $rentry->{u};
|
||||||
my $use_curl = $rentry->{use_curl};
|
my $use_curl = $rentry->{use_curl};
|
||||||
|
|
||||||
print $fe "Checking($entryidx) '$u': ";
|
print $fe "Checking($entryidx-$subprocess) '$u': ";
|
||||||
my ($res, $prnt, $outSum);
|
my ($res, $prnt, $outSum);
|
||||||
try {
|
try {
|
||||||
$res = check_url($u, $use_curl, $fe, $fs);
|
$res = check_url($u, $use_curl, $fe, $fs);
|
||||||
@ -246,30 +250,45 @@ for (my $i = 0; $i < $NR_JOBS; $i++) { # Number of subprocesses
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$wait[$i] = $pid;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (my $i = 0; $i < $NR_JOBS; $i++) {
|
sub readsublog($) {
|
||||||
my $p = $wait[$i];
|
my ($i) = @_;
|
||||||
if ($p > 0) {
|
open(my $fe, '<', "$tempdir/xxxError$i");
|
||||||
waitpid($p, 0);
|
while (my $l = <$fe>) {
|
||||||
open(my $fe, '<', "$tempdir/xxxError$i");
|
if ($l =~ /^NumberOfErrors\s(\d+)/) {
|
||||||
while (my $l = <$fe>) {
|
$errorcount += $1;
|
||||||
if ($l =~ /^NumberOfErrors\s(\d+)/) {
|
|
||||||
$errorcount += $1;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
print $l;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
close($fe);
|
else {
|
||||||
open(my $fs, '<', "$tempdir/xxxSum$i");
|
print $l;
|
||||||
while (my $l = <$fs>) {
|
|
||||||
print SFO $l;
|
|
||||||
}
|
}
|
||||||
close($fs);
|
}
|
||||||
|
close($fe);
|
||||||
|
open(my $fs, '<', "$tempdir/xxxSum$i");
|
||||||
|
while (my $l = <$fs>) {
|
||||||
|
print SFO $l;
|
||||||
|
}
|
||||||
|
close($fs);
|
||||||
|
}
|
||||||
|
|
||||||
|
my $p;
|
||||||
|
do {
|
||||||
|
$p = waitpid(-1, 0);
|
||||||
|
if (($p > 0) && defined($wait{$p}) && $wait{$p} >= 0) {
|
||||||
|
&readsublog($wait{$p});
|
||||||
|
$wait{$p} = -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
until ($p < 0);
|
||||||
|
print SFO "Started to protocol remaining subprocess-logs\n";
|
||||||
|
|
||||||
|
for my $p (keys %wait) {
|
||||||
|
if ($wait{$p} >= 0) {
|
||||||
|
&readsublog($wait{$p});
|
||||||
|
$wait{$p} = -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
print SFO "Stopped to protocol remaining subprocess-logs\n";
|
||||||
unlink($countfile);
|
unlink($countfile);
|
||||||
|
|
||||||
if (%URLS) {
|
if (%URLS) {
|
||||||
@ -348,7 +367,8 @@ sub parse_file($) {
|
|||||||
my $line = 0;
|
my $line = 0;
|
||||||
while (my $l = <FI>) {
|
while (my $l = <FI>) {
|
||||||
$line++;
|
$line++;
|
||||||
$l =~ s/[\r\n]+$//; # Simulate chomp
|
chomp($l);
|
||||||
|
# $l =~ s/[\r\n]+$//; # Simulate chomp
|
||||||
if ($status eq "out") {
|
if ($status eq "out") {
|
||||||
|
|
||||||
# searching for "\begin_inset Flex URL"
|
# searching for "\begin_inset Flex URL"
|
||||||
@ -413,6 +433,6 @@ sub getnrjobs($$$) {
|
|||||||
if ($nr_jobs < 2) {
|
if ($nr_jobs < 2) {
|
||||||
return ($remaining);
|
return ($remaining);
|
||||||
}
|
}
|
||||||
my $diff = 1 + int($remaining / (2 * $nr_jobs));
|
my $diff = 1 + int($remaining / (3 * $nr_jobs));
|
||||||
return $diff;
|
return $diff;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user