svn commit: r721962 - in /spamassassin/trunk: lib/Mail/SpamAssassin/ArchiveIterator.pm masses/mass-check

[fe...@apache.org]

Author: felicity
Date: Sun Nov 30 20:39:00 2008
New Revision: 721962

URL: http://svn.apache.org/viewvc?rev=721962&view=rev
Log:
when ArchiveIterator:run_file is loading a message, pay attention to opt_all.  also, if mass-check server has an error reading a message, throw a warning w/ the path in question.

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
    spamassassin/trunk/masses/mass-check

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm?rev=721962&r1=721961&r2=721962&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/ArchiveIterator.pm Sun Nov 30 20:39:00 2008
@@ -362,7 +362,7 @@
   my($inbuf,$nread);
   while ( $nread=read(INPUT,$inbuf,16384) ) {
     $len += $nread;
-    if ($len > BIG_BYTES) {
+    if (($len > BIG_BYTES) && !$self->{opt_all}) {
       info("archive-iterator: skipping large message\n");
       close INPUT  or die "error closing input file: $!";
       return;

Modified: spamassassin/trunk/masses/mass-check
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/mass-check?rev=721962&r1=721961&r2=721962&view=diff
==============================================================================
--- spamassassin/trunk/masses/mass-check (original)
+++ spamassassin/trunk/masses/mass-check Sun Nov 30 20:39:00 2008
@@ -1546,6 +1546,8 @@
           # run) we send a message number of 0 to indicate to the client that the server had an
           # error retrieving the message; we need to do this since we have already added the
           # line telling the client how many messages to expect
+          my $filename = (Mail::SpamAssassin::ArchiveIterator::_index_unpack($data))[3];
+          warn qq/mass-check: ArchiveIterator returned error for "$filename"\n/;
           send_line($gzfd, 0) || die "mass-check: error when writing to gz temp file\n";
           delete $msgsout->{$num};
           $failed_msgs++;