Changeset 11036

Timestamp:

Jan 11, 2007, 12:13:36 PM (19 years ago)

Author:

eugene

Message:

add exit codes, fault code setting

Location:

trunk/ippScripts/scripts

Files:

• phase0_exp.pl (modified) (9 diffs)
• phase0_imfile.pl (modified) (6 diffs)

trunk/ippScripts/scripts/phase0_exp.pl

@@ -14 +14 @@
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
 use Pod::Usage qw( pod2usage );
+
+use PS::IPP::Config qw(
+    $PS_EXIT_SUCCESS
+    $PS_EXIT_UNKNOWN_ERROR
+    $PS_EXIT_SYS_ERROR
+    $PS_EXIT_CONFIG_ERROR
+    $PS_EXIT_PROG_ERROR
+    $PS_EXIT_DATA_ERROR
+    $PS_EXIT_TIMEOUT_ERROR
+    );
 
 my ($cache, $exptag, $no_update);
@@ -67 +77 @@
 my $ppStats = can_run('ppStats')
     or (warn "can't find ppStats" and $missing_tools = 1);
-die "Can't find required tools.\n" if $missing_tools;
+if ($missing_tools) { 
+    warn ("Can't find required tools");
+    &my_die ("", $PS_EXIT_CONFIG_ERROR); 
+}
 
 # setup cache interface
@@ -84 +97 @@
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         cache_run(command => $command, verbose => 1);
-    die "Unable to perform p0tool on exposure id $exptag: $error_code\n" if not $success;
-    my $metadata = $mdcParser->parse(join "", @$stdout_buf)
-            or die "unable to parse metadata config doc";
+    unless ($success) {
+        warn ("Unable to perform p0tool on exposure id $exptag: $error_code");
+        &my_die ($exptag, $error_code);
+    }
+
+    my $metadata = $mdcParser->parse(join "", @$stdout_buf);
+    unless ($metadata) {
+        warn ("Unable to parse metadata config doc");
+        &my_die ($exptag, $PS_EXIT_PROG_ERROR);
+    }
     $imfiles = parse_md_list($metadata); # Data for imfiles
 }
@@ -104 +124 @@
         if (not defined $values{$constant}) {
             $values{$constant} = $value;
-        } elsif ($values{$constant} ne $value) {
-            die "Value of $constant for " . $imfile->{PHASE0_CLASSID} .
-                " doesn't match previous value.\n";
+        }
+        if ($values{$constant} ne $value) {
+            warn ("Value of $constant for $imfile->{PHASE0_CLASSID} doesn't match previous value");
+            &my_die ($exptag, $PS_EXIT_PROG_ERROR);
         }
     }
@@ -121 +142 @@
     my $stdev = get_value($imfile, PHASE0_BG_MEAN_STDEV());
     push @variances, $stdev**2;
+}
+
+# XXX for a test, randomly declare a failure and return to pantasks
+my $rnd = rand(1);
+if ($rnd > 0.5) {
+    warn ("random failure");
+    &my_die ($exptag, $PS_EXIT_DATA_ERROR);
 }
 
@@ -169 +197 @@
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         cache_run(command => \@command, verbose => 1);
-    die "Unable to run phase0 update for $exptag: $error_code\n" if not $success;
+    unless ($success) {
+        warn ("Unable to run phase0 update for $exptag: $error_code");
+        &my_die ($exptag, $error_code);
+    }
 }
 
 ### Pau.
-
 
 # Get the value for a particular imfile, along with a strong check for its existence
@@ -181 +211 @@
 
     my $source = $imfile->{PHASE0_CLASSID()}; # Where it comes from
-    die "Couldn't find value of $name for class_id=$source\n" if not defined $imfile->{$name};
+
+    unless (defined $imfile->{$name}) {
+        warn ("Couldn't find value of $name for class_id=$source");
+        &my_die ($exptag, $PS_EXIT_PROG_ERROR);
+    }
     return $imfile->{$name};
 }
@@ -199 +233 @@
 }
 
+sub my_die
+{
+    my $exp_tag = $_[0];
+    my $exit_code = $_[1];
+    if ($exp_tag) {
+        system ("$p0tool -faultexp -exp_tag $exp_tag -code $exit_code");
+    }
+    exit $exit_code;
+}
+
 END {
     my $exit = $?;
@@ -204 +248 @@
     $? = $exit;
 }
-

trunk/ippScripts/scripts/phase0_imfile.pl

@@ -15 +15 @@
 use Data::Dumper;
 
-use PS::IPP::Config;
+use PS::IPP::Config qw(
+    $PS_EXIT_SUCCESS
+    $PS_EXIT_UNKNOWN_ERROR
+    $PS_EXIT_SYS_ERROR
+    $PS_EXIT_CONFIG_ERROR
+    $PS_EXIT_PROG_ERROR
+    $PS_EXIT_DATA_ERROR
+    $PS_EXIT_TIMEOUT_ERROR
+    );
+
 my $ipprc = PS::IPP::Config->new(); # IPP configuration
 use File::Spec;
@@ -40 +49 @@
     and defined $uri;
 
-use constant RECIPE => "PPSTATS_PHASE0"; # Recipe to use for ppStats
+my $RECIPE = "PPSTATS_PHASE0"; # Recipe to use for ppStats
+# use constant RECIPE => "PPSTATS_PHASE0"; # Recipe to use for ppStats
 
 # These values should be constant for all components
@@ -77 +87 @@
 my $p0tool = can_run('p0tool') or (warn "Can't find p0tool" and $missing_tools = 1);
 my $ppStats = can_run('ppStats') or (warn "Can't find ppStats" and $missing_tools = 1);
-die "Can't find required tools.\n" if $missing_tools;
+
+if ($missing_tools) { 
+    warn ("Can't find required tools");
+    &my_die ("", "", $PS_EXIT_CONFIG_ERROR); 
+}
 
 # setup cache interface
@@ -92 +106 @@
 my $stats;
 {
-    my $command = "$ppStats $uri -recipe PPSTATS " . RECIPE; # Command to run ppStats
+    my $command = "$ppStats $uri -recipe PPSTATS $RECIPE"; # Command to run ppStats
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         cache_run(command => $command, verbose => 1);
-    die "Unable to perform ppStats on exposure id $exp_tag: $error_code\n"
-        if not $success;
+    unless ($success) { 
+        warn ("Unable to perform ppStats on exposure id $exp_tag: $error_code");
+        &my_die ($exp_tag, $class_id, $error_code);
+    }
     
     # Parse the output
     my $mdcParser = PS::IPP::Metadata::Config->new;        # Parser for metadata config files
-    my $metadata = $mdcParser->parse(join "", @$stdout_buf)
-            or die "unable to parse metadata config doc";
+    my $metadata = $mdcParser->parse(join "", @$stdout_buf); # XXX is this join necessary?
+    unless ($metadata) {
+        warn ("Unable to parse metadata config doc");
+        &my_die ($exp_tag, $class_id, $PS_EXIT_PROG_ERROR);
+    }
     my @constants = keys %{CONSTANTS()}; # List of constants to parse out
     my @variables = keys %{VARIABLES()}; # List of variables to parse out
     $stats = PS::IPP::Metadata::Stats->new(\@constants, \@variables); # Stats parser
-    $stats->parse($metadata) or die "Unable to find all values.\n";
+    unless ($stats->parse($metadata)) {
+        warn ("Unable to find all values");
+        &my_die ($exp_tag, $class_id, $PS_EXIT_PROG_ERROR);
+        # XXX is this a programming or a config error?
+    }
+ 
+    # XXX for a test, randomly declare a failure and return to pantasks
+    my $rnd = rand(1);
+    if ($rnd > 0.5) {
+        warn ("random failure");
+        &my_die ($exp_tag, $class_id, $PS_EXIT_DATA_ERROR);
+    }
 }
 
@@ -151 +181 @@
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => \@command, verbose => 1);
-    die "Unable to perform p0tool -updateimfile: $error_code\n" if not $success;
+
+    unless ($success) {
+        # XXX this is tricky: if we can't run -updateimfile, can we actually set the error code?
+        # XXX if this is not a database error, it is probably a programming error (in p0tool or the passed args)
+        warn ("Unable to perform p0tool -updateimfile: $error_code");
+        &my_die ($exp_tag, $class_id, $error_code);
+    }
 }
 
@@ -166 +202 @@
         return @output;
     }
+}
+
+sub my_die
+{
+    my $exp_tag = $_[0];
+    my $class_id = $_[1];
+    my $exit_code = $_[2];
+    if ($exp_tag && $class_id) {
+        system ("$p0tool -faultimfile -exp_tag $exp_tag -class_id $class_id -code $exit_code");
+    }
+    exit $exit_code;
 }