Ticket #279: process-quarantine.patch

process-quarantine.pl

@@ -164 +164 @@
 push(@cl_array, "--ham-only") if ($hamonly); # process ham only
 push(@cl_array, "--debug") if ($debug); # turn on debugging mode
 push(@cl_array, "--quiet") if ($quiet); # turn on quiet mode
+push(@cl_array, "|| /bin/echo \"DIED: \$?\""); # hacked exit status reporter
+
+my $cl_command = join(' ', @cl_array);
 
 # Call the subroutine until there are no items left to process
 my $total_items_processed = 0;
 my $total_processing_runs = 0;
 my $items_processed = -1;
 while ($items_processed != 0) {
-    $items_processed = system(@cl_array) / 256;
+    $items_processed = 0;
+    open(CL, "$cl_command |") || die "can't run subroutine: $!\n";
+      while (chomp(my $clout = <CL>)) {
+        if ($clout =~ m/^DIED: (\d)+/) {
+          $clout =~ s/^DIED: //;
+          die "subroutine died with error status $clout";
+        } elsif ($clout =~ m/^(\d)+/) {
+           $items_processed .= $clout;
+        } else {
+          print "$clout\n";
+        }
+      }
+    close(CL);
     $total_items_processed += $items_processed;
     $total_processing_runs++;
     if ($debug) {

process-quarantine-sub.pl

@@ -111 +111 @@
 {
    my ($msg) = @_;
 
-   print $msg . "\n";
+   print STDERR $msg . "\n";
    exit 0;
 }
 
@@ -558 +558 @@
 # Disconnect from the database
 $dbh->disconnect;
 
-# We're done, return the total number of items processed.
-exit ($spamcount + $hamcount);
+# We're done, print the total number of items processed and return.
+print ($spamcount + $hamcount);
+exit(0);