Commit b674bfe1 authored by Leo Gordon's avatar Leo Gordon
Browse files

added two hotfixes from stable

parents 2ff18a11 d15ca8f8
......@@ -362,10 +362,10 @@ sub determine_status {
my $absolute_tolerance = $analysis->failed_job_tolerance * $self->total_job_count / 100.0;
if ($self->failed_job_count > $absolute_tolerance) {
$self->status('FAILED');
print "\n##################################################\n";
printf("## ERROR: %-35s ##\n", $analysis->logic_name." failed!");
printf("## %d jobs failed (tolerance: %d (%3d%%)) ##\n", $self->failed_job_count, $absolute_tolerance, $analysis->failed_job_tolerance);
print "##################################################\n\n";
warn "\n##################################################\n";
warn sprintf("## ERROR: %-35s ##\n", $analysis->logic_name." failed!");
warn sprintf("## %d jobs failed (tolerance: %d (%3d%%)) ##\n", $self->failed_job_count, $absolute_tolerance, $analysis->failed_job_tolerance);
warn "##################################################\n\n";
} else {
$self->status('DONE');
}
......
......@@ -738,7 +738,7 @@ sub get_remaining_jobs_show_hive_progress {
? ((100.0 * ($done+$failed))/$total)
: 0.0;
my $remaining = $total - $done - $failed;
printf("hive %1.3f%% complete (< %1.3f CPU_hrs) (%d todo + %d done + %d failed = %d total)\n",
warn sprintf("hive %1.3f%% complete (< %1.3f CPU_hrs) (%d todo + %d done + %d failed = %d total)\n",
$completed, $cpuhrs, $remaining, $done, $failed, $total);
return $remaining;
}
......
......@@ -319,7 +319,7 @@ sub main {
align => 'left',
},
xtics => {
labelfmt => '%b %d\n %H:00',
labelfmt => '%b %d\n %H:%M',
along => 'out nomirror',
},
bg => {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment