Changeset 22430 for trunk/ippScripts/scripts/detrend_stack.pl

Timestamp:

Feb 24, 2009, 12:00:25 PM (17 years ago)

Author:

Paul Price

Message:

Adding handling for missed exceptions, similar to register_imfile.pl --- the idea is to have exceptions trigger the my_die functions so that errors are recorded in the database, and don't go on forever.

File:

• trunk/ippScripts/scripts/detrend_stack.pl (modified) (5 diffs)

trunk/ippScripts/scripts/detrend_stack.pl

@@ -23 +23 @@
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
 use Pod::Usage qw( pod2usage );
+
+# Look for programs we need
+my $missing_tools;
+my $dettool = can_run('dettool') or (warn "Can't find dettool" and $missing_tools = 1);
+my $ppMerge = can_run('ppMerge') or (warn "Can't find ppMerge" and $missing_tools = 1);
+my $ppStatsFromMetadata = can_run('ppStatsFromMetadata') or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1);
+if ($missing_tools) {
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
 
 my ( $det_id, $iter, $class_id, $det_type, $camera, $outroot, $dbname, $reduction, $threads, $verbose, $save_temps,
@@ -59 +69 @@
     or &my_die("Missing entry in file rules", $det_id, $iter, $class_id, $PS_EXIT_CONFIG_ERROR);
 
+# Unhandled exceptions should be passed on to my_die so they get pushed into the database
+$SIG{__DIE__} = sub { die @_ if $^S;
+                      my_die( $_[0], $det_id, $iter, $class_id, $PS_EXIT_UNKNOWN_ERROR ); };
+
 # optionally redirect the outputs from this script to LOG.IMFILE
 $ipprc->redirect_output($logDest) if $redirect;
@@ -65 +79 @@
 $reduction = "DETREND" unless defined $reduction;
 my $recipe = $ipprc->reduction($reduction, $det_type . '_STACK'); # Recipe name to use
-
-# Look for programs we need
-my $missing_tools;
-my $dettool = can_run('dettool') or (warn "Can't find dettool" and $missing_tools = 1);
-my $ppMerge = can_run('ppMerge') or (warn "Can't find ppMerge" and $missing_tools = 1);
-my $ppStatsFromMetadata = can_run('ppStatsFromMetadata') or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1);
-if ($missing_tools) {
-    warn("Can't find required tools.");
-    exit($PS_EXIT_CONFIG_ERROR);
-}
 
 # The output file rule name depends on the detrend type
@@ -219 +223 @@
     }
     foreach my $line (@$stdout_buf) {
-        $cmdflags .= " $line";
+        $cmdflags .= " $line";
     }
     chomp $cmdflags;
@@ -261 +265 @@
         $command .= " -iteration $iter";
         $command .= " -class_id $class_id";
-        # XXX EAM : we should add this to the db : $command .= " -path_base $outroot";
+        # XXX EAM : we should add this to the db : $command .= " -path_base $outroot";
         $command .= " -code $exit_code";
         $command .= " -dbname $dbname" if defined $dbname;