Changeset 20219

Timestamp:

Oct 17, 2008, 9:39:31 AM (18 years ago)

Author:

bills

Message:

make sure request->state gets set to stop on failure

File:

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

trunk/pstamp/scripts/pstamp_finish.pl

@@ -74 +74 @@
         print STDERR  "output fileset directory $out_dir does not exist\n";
 
-        # XXX TODO: if this fails fault the request so we pstamp_finish 
-
-        mkdir $out_dir or die "cannot create output directory $out_dir";
+        if (!mkdir $out_dir) {
+            print STDERR "cannot create output directory $out_dir";
+            stop_request($req_id, $PS_EXIT_UNKNOWN_ERROR, $dbname);
+        }
+
 
     } elsif (! -d $out_dir ) {
         # XXX TODO: fault the request so we pstamp_finish doesn't keep trying to process the
         # request
-        die "output fileset directory $out_dir exists but is not a directory";
+        print STDERR "output fileset directory $out_dir exists but is not a directory";
+        stop_request($req_id, $PS_EXIT_UNKNOWN_ERROR, $dbname);
     }
 
@@ -87 +90 @@
         print STDERR "request file $req_file is missing\n";
         stop_request($req_id, $PS_EXIT_CONFIG_ERROR, $dbname);
-        exit  $PS_EXIT_CONFIG_ERROR;
     }
 
@@ -98 +100 @@
         print STDERR "failed to read request_file $req_file" ;
         stop_request($req_id, $PS_EXIT_CONFIG_ERROR, $dbname);
-        exit  $PS_EXIT_CONFIG_ERROR;
     }
 
@@ -231 +232 @@
             print STDERR "Unable to perform $command error code: $error_code\n";
             $request_fault = $error_code >> 8;
+            # fall through to stop the request
         }
     }
@@ -258 +260 @@
         die("Unable to perform $command error code: $error_code");
     }
+    exit $fault;
 }