Changeset 22430 for trunk/ippScripts/scripts/magic_destreak.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/magic_destreak.pl (modified) (6 diffs)

trunk/ippScripts/scripts/magic_destreak.pl

@@ -26 +26 @@
 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 $magicdstool   = can_run('magicdstool') or (warn "Can't find magicdstool" and $missing_tools = 1);
+my $streaksremove = can_run('streaksremove') or (warn "Can't find streaksremove" and $missing_tools = 1);
+if ($missing_tools) {
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
 
 # Parse the command-line arguments
@@ -66 +75 @@
     defined $component and
     defined $outroot;
-    
+
+# 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], $magic_ds_id, $component, $PS_EXIT_UNKNOWN_ERROR ); };
+
 
 my ($skycell_args, $class_id, $skycell_id);
@@ -87 +100 @@
 
 
-# Look for programs we need
-my $missing_tools;
-my $magicdstool   = can_run('magicdstool') or (warn "Can't find magicdstool" and $missing_tools = 1);
-my $streaksremove = can_run('streaksremove') or (warn "Can't find streaksremove" and $missing_tools = 1);
-if ($missing_tools) {
-    warn("Can't find required tools.");
-    exit($PS_EXIT_CONFIG_ERROR);
-}
-
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
 
@@ -128 +132 @@
     if (! -e $outroot ) {
         my $code = system "mkdir -p $outroot";
-        &my_die("cannot create output directory $outroot", $magic_ds_id, $component, 
+        &my_die("cannot create output directory $outroot", $magic_ds_id, $component,
                 $code >> 8) if $code;
     }
@@ -143 +147 @@
         if (! -e $recoveryroot ) {
             my $code = system "mkdir -p $recoveryroot";
-            &my_die("cannot create output directory $outroot", $magic_ds_id, $component, 
+            &my_die("cannot create output directory $outroot", $magic_ds_id, $component,
                     $code >> 8) if $code;
         }
@@ -151 +155 @@
 
 # get skycell list if needed
-my ($sfh, $skycell_list);          
+my ($sfh, $skycell_list);
 if ($skycell_args) {
     my $command = "$magicdstool -magic_ds_id $magic_ds_id -getskycells $skycell_args";