svn commit: r595224 - /spamassassin/trunk/masses/mass-check

[do...@apache.org]

Author: dos
Date: Wed Nov 14 22:56:15 2007
New Revision: 595224

URL: http://svn.apache.org/viewvc?rev=595224&view=rev
Log:
prevent cs_server w/cs_schedule_cache non-completion caused by malformed cs_client result lines (cause of malformed result lines currently unknown)... see mass-check --cs_schedule_cache & "0 messages outstanding" thread on dev@ on Nov 14, 2007

Modified:
    spamassassin/trunk/masses/mass-check

Modified: spamassassin/trunk/masses/mass-check
URL: http://svn.apache.org/viewvc/spamassassin/trunk/masses/mass-check?rev=595224&r1=595223&r2=595224&view=diff
==============================================================================
--- spamassassin/trunk/masses/mass-check (original)
+++ spamassassin/trunk/masses/mass-check Wed Nov 14 22:56:15 2007
@@ -1444,9 +1444,8 @@
         }
       }
     }
-
-    # close the tmpfd, etc so that the main loop knows we're done
-    if ($msgs_processed == $total_messages) {
+    else {
+      # close the tmpfd, etc so that the main loop knows we're done
       delete $msgsout->{'curnum'};
       close $tmpfd;
       undef $tmpfd;
@@ -2520,6 +2519,12 @@
   }
   else {
     warn ">> WTH!?  result is not in the correct format: $result\n";
+    # 20071114: bit of a hack
+    # prevent malformed cs_client message result lines from preventing the
+    # cs_server running in cs_schedule cache mode from completing
+    # TODO: find out how result lines get malformed (malformed result lines
+    # will still hang any cs_server not running with cs_schedule_cache)
+    $msgs_processed++ if $opt_cs_schedule_cache;
   }
 }