Changeset 42047

Timestamp:

Feb 17, 2022, 1:57:29 PM (4 years ago)

Author:

ippitc

Message:

merge fixed wrong command string returned when psphotForced fails (MEH, IPP-946)

File:

• tags/ipp-20170121/pstamp/scripts/dquery_job_run.pl (modified) (3 diffs, 1 prop)

tags/ipp-20170121/pstamp/scripts/dquery_job_run.pl

@@ -121 +121 @@
 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
     run(command => $command, verbose => $verbose);
+## MEH need to adjust error_code to rc
 unless ($success) {
-    my_die("Unable to perform $command. Error_code: $error_code",
+    my $rc = $error_code >> 8;
+    my_die("Unable to perform $command. Error_code: $error_code $rc",
            $params->{QUERY_ID},$fpa_id,$params->{'MJD-OBS'},
            $params->{FILTER},$params->{OBSCODE},$params->{STAGE},
-           $error_code);
+           $rc);
 }
 my @response = split /\n/, (join "", @$stdout_buf);
@@ -164 +166 @@
     # $params->{PROC_ERROR} = $PSTAMP_SYSTEM_ERROR;
     my $rc = $error_code >> 8;
-    my_die("$command failed: $error_code $rc",
+    my_die("$psphot_cmd failed: $error_code $rc",
            $params->{QUERY_ID},$fpa_id,$params->{'MJD-OBS'},
            $params->{FILTER},$params->{OBSCODE},$params->{STAGE},
@@ -387 +389 @@
     $exit_code = $PS_EXIT_PROG_ERROR unless defined $exit_code;
 
-    carp("$message : $QUERY_ID $FPA_ID $MJD_OBS $FILTER $OBSCODE $STAGE");
+    #carp("$message : $QUERY_ID $FPA_ID $MJD_OBS $FILTER $OBSCODE $STAGE");
+    carp("$message : $QUERY_ID $FPA_ID $MJD_OBS $FILTER $OBSCODE $STAGE $exit_code");
+
     exit($exit_code);