Changeset 28227

Timestamp:

Jun 4, 2010, 2:58:02 PM (16 years ago)

Author:

bills

Message:

don't set request state to stop if pstamp_finish fails. All user errors should be handled now
and a fault is a problem we should fix

File:

• trunk/pstamp/scripts/pstamp_finish.pl (modified) (3 diffs)

trunk/pstamp/scripts/pstamp_finish.pl

@@ -275 +275 @@
                 print STDERR "Unable to perform $command error code: $error_code\n";
                 $request_fault = $error_code >> 8;
+                stop_request_and_exit($req_id, $request_fault);
             }
         }
@@ -291 +292 @@
             print STDERR "Unable to perform $command error code: $error_code\n";
             $request_fault = $error_code >> 8;
-            # fall through to stop the request
+            stop_request_and_exit($req_id, $request_fault);
         }
     }
     # set the request's state to stop
     {
-        my $command = "$pstamptool -updatereq -req_id $req_id -set_state stop -set_fault $request_fault";
+        my $command = "$pstamptool -updatereq -req_id $req_id -set_state stop";
         $command   .= " -dbname $dbname" if $dbname;
         $command   .= " -dbserver $dbserver" if $dbserver;
@@ -309 +310 @@
 
 sub stop_request_and_exit {
+    # this no longer stops the request. Arguably this should be an old fashioned mydie
     my $req_id = shift;
     my $fault  = shift;
 
-    my $command = "$pstamptool -updatereq -req_id $req_id -set_state stop -set_fault $fault";
+    my $command = "$pstamptool -updatereq -req_id $req_id -set_fault $fault";
     $command   .= " -dbname $dbname" if $dbname;
     $command   .= " -dbserver $dbserver" if $dbserver;