From 3763748dbbd71742cdf472dc5fb952245493f637 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 12 Jan 2010 08:39:30 +0000 Subject: [PATCH] revert unmeant previous change which caused errors to stay, even after successful evaluation of jobs --- src/script/hydra_scheduler.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/script/hydra_scheduler.pl b/src/script/hydra_scheduler.pl index 0a0cf1bb..960fd6df 100755 --- a/src/script/hydra_scheduler.pl +++ b/src/script/hydra_scheduler.pl @@ -44,7 +44,11 @@ sub setJobsetError { sub sendJobsetErrorNotification() { my ($jobset, $errorMsg) = @_; +print STDERR "\n" ; +print STDERR $errorMsg ; +print STDERR "\n" ; return if $jobset->project->owner->emailonerror == 0; + return if $errorMsg eq ""; my $projectName = $jobset->project->name; my $jobsetName = $jobset->name; @@ -161,9 +165,7 @@ sub checkJobset { } $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"; txn_do($db, sub { $jobset->update({lastcheckedtime => time}); - if( !($msg eq "") ) { - setJobsetError($jobset, $msg); - } + setJobsetError($jobset, $msg); }); } }