[interchange-cvs] interchange - racke modified 2 files

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2007-11-23 12:58:20 GMT
Modified:  .        WHATSNEW-5.5
Modified:  lib/Vend Dispatch.pm
Log:
Force email notification of errors, can be prevented with ignore_errors
setting.

Revision  Changes    Path
1.77      +6 -0      interchange/WHATSNEW-5.5


rev 1.77, prev_rev 1.76
Index: WHATSNEW-5.5
===================================================================
RCS file: /var/cvs/interchange/WHATSNEW-5.5,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- WHATSNEW-5.5	16 Nov 2007 13:52:58 -0000	1.76
+++ WHATSNEW-5.5	23 Nov 2007 12:58:19 -0000	1.77
@@ -81,6 +81,12 @@
 
 * Removed inoperative WellsFargo payment module.
 
+Jobs
+----
+
+* Force email notification of errors, can be prevented with ignore_errors
+  setting.
+
 UI
 --
 



1.92      +7 -3      interchange/lib/Vend/Dispatch.pm


rev 1.92, prev_rev 1.91
Index: Dispatch.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Dispatch.pm,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- Dispatch.pm	2 Sep 2007 19:21:04 -0000	1.91
+++ Dispatch.pm	23 Nov 2007 12:58:19 -0000	1.92
@@ -1,6 +1,6 @@
 # Vend::Dispatch - Handle Interchange page requests
 #
-# $Id: Dispatch.pm,v 1.91 2007/09/02 19:21:04 kwalsh Exp $
+# $Id: Dispatch.pm,v 1.92 2007/11/23 12:58:19 racke Exp $
 #
 # Copyright (C) 2002-2007 Interchange Development Group
 # Copyright (C) 2002 Mike Heins <mike at perusion.net>
@@ -26,7 +26,7 @@
 package Vend::Dispatch;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 1.91 $, 10);
+$VERSION = substr(q$Revision: 1.92 $, 10);
 
 use POSIX qw(strftime);
 use Vend::Util;
@@ -767,7 +767,7 @@
 		push @itl, ["Passed ITL", $itl];
 	}
 
-	my (@out, $errors);
+	my (@out, $errors, $failure);
 
 	# remove bogus session created by logError
 	undef $Vend::Session;
@@ -815,6 +815,7 @@
 			# job terminated due to an error
 			$errors = 1;
 
+			$failure = errmsg('Job terminated with an error: %s', $@);
 			logError ("Job group=%s pid=$$ terminated with an error: %s", $job || 'INTERNAL', $@);
 			
 			# remove flag for this job
@@ -832,6 +833,9 @@
 	my $out = join "", @out;
 	my $filter = $jobscfg->{filter} || 'strip';
 	$out = Vend::Interpolate::filter_value($filter, $out);
+	if ($errors && is_no($jobscfg->{ignore_errors})) {
+		$out = join("\n\n", $failure, $out);
+	}
 	$out .= full_dump() if is_yes($jobscfg->{add_session});
 
 	logError("Finished jobs group=%s pid=$$", $job || 'INTERNAL');