revert unmeant previous change which caused errors to stay, even after successful evaluation of jobs

This commit is contained in:
Rob Vermaas 2010-01-12 08:39:30 +00:00
parent 13c8953918
commit 3763748dbb

View file

@ -44,7 +44,11 @@ sub setJobsetError {
sub sendJobsetErrorNotification() { sub sendJobsetErrorNotification() {
my ($jobset, $errorMsg) = @_; my ($jobset, $errorMsg) = @_;
print STDERR "\n" ;
print STDERR $errorMsg ;
print STDERR "\n" ;
return if $jobset->project->owner->emailonerror == 0; return if $jobset->project->owner->emailonerror == 0;
return if $errorMsg eq "";
my $projectName = $jobset->project->name; my $projectName = $jobset->project->name;
my $jobsetName = $jobset->name; my $jobsetName = $jobset->name;
@ -161,9 +165,7 @@ sub checkJobset {
} }
$msg .= "at `" . $error->{location} . "' [$bindings]:\n" . $error->{msg} . "\n\n"; $msg .= "at `" . $error->{location} . "' [$bindings]:\n" . $error->{msg} . "\n\n";
} }
if( !($msg eq "") ) { setJobsetError($jobset, $msg);
setJobsetError($jobset, $msg);
}
} }
@ -181,9 +183,7 @@ sub checkJobsetWrapped {
print "error evaluating jobset ", $jobset->name, ": $msg"; print "error evaluating jobset ", $jobset->name, ": $msg";
txn_do($db, sub { txn_do($db, sub {
$jobset->update({lastcheckedtime => time}); $jobset->update({lastcheckedtime => time});
if( !($msg eq "") ) { setJobsetError($jobset, $msg);
setJobsetError($jobset, $msg);
}
}); });
} }
} }