simcop2387/treedeps
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Clean up better against Apache. I hate apache. Also change progress to report dists/min instead of sec.

Browse source
This commit is contained in:
Your Name 2017-04-09 04:38:44 -04:00
parent 5e3dbd5665
commit b780fd380e
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
disableembperl.pl
View file

@ -8,9 +8,9 @@ use Storable;
my $data = retrieve $ARGV[0]; my $data = retrieve $ARGV[0];
for my $mod ($data->{modules}->@*) { for my $mod ($data->{modules}->@*) {
if ($mod =~ /Embperl/ && !$data->{jobstatus}{$mod}{tested}) { if ($mod =~ /Nagios/ && !$data->{jobstatus}{$mod}{tested}) {
$data->{jobstatus}{$mod}={tested => 3, status => "embperl failure"}; $data->{jobstatus}{$mod}={tested => 3, status => "nagios failure"};
} }
} }
store $data, $ARGV[0].'.new'; store $data, $ARGV[0];

BIN
everything.stor
View file

Binary file not shown.

4
lib/TestCpanInc.pm
View file

@ -69,7 +69,7 @@ sub run_cpanm {
my $st = time(); my $st = time();
while($h->pumpable()) { # still getting output while($h->pumpable()) { # still getting output
$h->pump_nb(); $h->pump_nb();
if (length($out) > 20*1024*1024) { # 20 meg limit on output if (length($out) > 10*1024*1024) { # 20 meg limit on output
die "Output too long. Failing build\n"; die "Output too long. Failing build\n";
} }
sleep(0.1); sleep(0.1);
@ -81,8 +81,8 @@ sub run_cpanm {
}; };
my $err = $@; my $err = $@;
print " "x20, "\r"; print " "x20, "\r";
eval {$h->finish()} if $err;
$h->kill_kill(); # reap all the kids $h->kill_kill(); # reap all the kids
eval {print "Double finish\n"; $h->finish();} if $err;
my $exitcode = $err || $h->full_result(); my $exitcode = $err || $h->full_result();
return ($exitcode, $out); return ($exitcode, $out);

2
progress2.pl
View file

@ -26,6 +26,6 @@ while (1) {
my $rate = ($count-$first_count)/(time()-$start_time); my $rate = ($count-$first_count)/(time()-$start_time);
my $tocomplete = ($rate == 0? sub{-1} : sub{($dists-$count)/$rate})->(); my $tocomplete = ($rate == 0? sub{-1} : sub{($dists-$count)/$rate})->();
my $final_dt = $start_dt->clone()->add(seconds => $tocomplete); my $final_dt = $start_dt->clone()->add(seconds => $tocomplete);
printf "%d/%d [%02.2f%%] %0.2f/s %s %0.2f\n", $count, $dists, 100*$count/$dists, $rate, $final_dt->iso8601, $tocomplete; printf "%d/%d [%02.2f%%] %0.2f/min %s %0.2f\n", $count, $dists, 100*$count/$dists, $rate*60, $final_dt->iso8601, $tocomplete;
}; };