Changeset 23199 for branches/cnb_branches/cnb_branch_20090215/ippScripts/scripts/register_imfile.pl

Timestamp:

Mar 5, 2009, 11:24:29 AM (17 years ago)

Author:

beaumont

Message:

sync with mainline

Location:

branches/cnb_branches/cnb_branch_20090215

Files:

• . (modified) (1 prop)
• ippScripts/scripts/register_imfile.pl (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090215/ippScripts/scripts/register_imfile.pl

@@ -23 +23 @@
 use Math::Trig;
 
-my $ipprc = PS::IPP::Config->new(); # IPP configuration
 use File::Spec;
 
@@ -49 +48 @@
 ) or pod2usage( 2 );
 
-# 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], $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_UNKNOWN_ERROR ); };
-
-$ipprc->redirect_output($logfile) if $logfile;
+my $ipprc = PS::IPP::Config->new() or my_die( "Unable to set up", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
+$ipprc->redirect_output($logfile) or my_die( "Unable to redirect output", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_SYS_ERROR ) if $logfile;
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;