Changeset 33057

Timestamp:

Jan 9, 2012, 1:54:53 PM (14 years ago)

Author:

bills

Message:

various changes that have been running in the tag

Location:

tags/ipp-20111222/pstamp/scripts

Files:

• . (modified) (1 prop)
• pstamp_checkdependent.pl (modified) (1 diff)
• pstamp_get_image_job.pl (modified) (1 diff)
• pstamp_job_run.pl (modified) (2 diffs)
• pstamp_parser_run.pl (modified) (1 diff)
• pstamp_server_status (modified) (1 diff)

tags/ipp-20111222/pstamp/scripts/pstamp_checkdependent.pl

@@ -285 +285 @@
             } elsif ($fault_count > $max_fault_count) {
                 print "$stage $stage_id has faulted $fault_count times. Giving up\n";
-                $fault = $PSTAMP_GONE;
-                faultComponent('chip', $chip->{chip_id}, $chip->{class_id}, $PSTAMP_GONE);
-                return $PSTAMP_GONE;
+                # XXX: stop faulting chips for now
+#                $fault = $PSTAMP_GONE;
+#                faultComponent('chip', $chip->{chip_id}, $chip->{class_id}, $PSTAMP_GONE);
+                $fault = $PSTAMP_NOT_AVAILABLE;
+                return $fault;
             }
             # fault the dependent

tags/ipp-20111222/pstamp/scripts/pstamp_get_image_job.pl

@@ -126 +126 @@
     $command .= " --results_file $results_file";
     $command .= " --component $component --path_base $path_base --outroot $outroot";
-    #    XXX: we need to do some work if we want to support muggle bundles
-    #    $command .= " --no_magic if $no_magic";
-    $command .= " --magicked" if $magicked;
+    # DING DONG ....
+    $command .= " --no_magic";
     $command .= " --dbname $imagedbname" if $imagedbname;
     $command .= " --verbose" if $verbose;

tags/ipp-20111222/pstamp/scripts/pstamp_job_run.pl

@@ -59 +59 @@
 $options = 1 if !$options;
 
+# We don't need to muggle anymore. Ignore those options
+$options &= ~($PSTAMP_REQUEST_UNCENSORED | $PSTAMP_REQUIRE_UNCENSORED);
 
 my $ipprc = PS::IPP::Config->new(); # IPP Configuration
@@ -108 +110 @@
         $nan_masked = 0;
         $muggle = 1;
+    }
+
+    if ($stage eq "raw") {
+        $options &= ~($PSTAMP_SELECT_MASK | $PSTAMP_SELECT_VARIANCE); 
     }
 

tags/ipp-20111222/pstamp/scripts/pstamp_parser_run.pl

@@ -54 +54 @@
     print "Starting script $0 on $host\n\n";
 }
+
+$need_magic = 0;
 
 my $missing_tools;

tags/ipp-20111222/pstamp/scripts/pstamp_server_status

@@ -71 +71 @@
         $error_code = (($error_code >> 8) or 1);
         if ($error_code == 12) {
-            #print "Postage Stamp Server is not running\n";
-            print "Postage Stamp Server will be down for maintenance it will back shortly.\n";
+            print "Postage Stamp Server is not running\n";
+            #print "Postage Stamp Server will be down for maintenance it will back shortly.\n";
             exit 0;
         } else {