Changeset 43048 for branches/eam_branches/ipp-pstamp-20260421/pstamp/scripts/pstampparse.pl

Timestamp:

Jun 1, 2026, 4:53:16 PM (2 months ago)

Author:

eugene

Message:

working on modernizing the error_code trapping

File:

• branches/eam_branches/ipp-pstamp-20260421/pstamp/scripts/pstampparse.pl (modified) (6 diffs)

branches/eam_branches/ipp-pstamp-20260421/pstamp/scripts/pstampparse.pl

@@ -15 +15 @@
 use File::Temp qw(tempfile);
 use File::Basename qw(basename);
+use Scalar::Util qw(looks_like_number);
 use Carp;
 use POSIX;
@@ -126 +127 @@
 {
     my $command = "echo $request_file_name | $fields -x 0 EXTNAME EXTVER REQ_NAME ACTION EMAIL";
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+    my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);
+    my $error_code = &parse_error_message ($success, $error_msg, $command);
 
     # note fields doesn't return zero when it succeeds.
@@ -184 +186 @@
     my $command = "$pstamptool -listreq  -name $req_name -not_req_id $req_id";
     # no verbose so that error message about request not found doesn't appear in parse_error.txt
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+    my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 0);
-    my $exitStatus = $error_code >> 8;
+    my $error_code = &parse_error_message ($success, $error_msg, $command);
+    my $exitStatus = $error_code;
     if ($success) {
         # -listreq succeeded there is already a request in the database with this name
@@ -781 +784 @@
 
     my $base = basename($image->{image});
-    if (! $base =~ /.fits$/ ) {
+    if (! ($base =~ /.fits$/) ) {
         my_die("unexpected image file name found $image->{image}", $PS_EXIT_PROG_ERROR);
     }
@@ -1136 +1139 @@
 
     if (!$no_update) {
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) =
             run(command => $command, verbose => $verbose);
+        my $error_code = &parse_error_message ($success, $error_msg, $command);
         unless ($success) {
-            my $fault = $error_code >> 8;
+            my $fault = $error_code;
             print STDERR "$command failed with fault $fault\n";
             if ($fault < $PSTAMP_FIRST_ERROR_CODE) {
@@ -1421 +1425 @@
     exit $fault;
 }
+
+# if the program exited normally, the exit value is returned
+# if the program exited with a signal (abort, crash, etc), PS_EXIT_PROG_ERROR (4) is returned
+# if the program failed to run, -PS_EXIT_PROG_ERROR (-4) is returned
+sub parse_error_message {
+    my $success = shift;
+    my $error_msg = shift;
+    my $command = shift;
+
+    if ($success) { return 0; }
+
+    print "raw error_msg: $error_msg\n";
+    print "full command: $command\n";
+
+    if (&looks_like_number($error_msg)) { return (($error_msg >> 8) or ($PS_EXIT_PROG_ERROR)); }
+        
+    # which of these match?
+    my ($error_code) = $error_msg =~ m/exited with value (\d+)/;
+    if (defined $error_code) { return $error_code; }
+    
+    ($error_code) = $error_msg =~ m/died with signal (\d+)/;
+#   if (defined $error_code) { return (128 + $error_code); }
+    if (defined $error_code) { return ($PS_EXIT_PROG_ERROR); }
+    
+    # probably failed to execute:
+    return (-1*$PS_EXIT_PROG_ERROR);
+}
+