svn commit: r179316 - /spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm

[fe...@apache.org]

Author: felicity
Date: Tue May 31 16:52:33 2005
New Revision: 179316

URL: http://svn.apache.org/viewcvs?rev=179316&view=rev
Log:
don't mislead when doing bayes sync/expiry -- specify what we're doing and when it's done, don't say we're doing both then maybe not do anything.

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm?rev=179316&r1=179315&r2=179316&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Bayes.pm Tue May 31 16:52:33 2005
@@ -1010,10 +1010,16 @@
   my ($self, $sync, $expire, $opts) = @_;
   if (!$self->{conf}->{use_bayes}) { return 0; }
 
-  dbg("bayes: syncing bayes and expiring old tokens...");
-  $self->{store}->sync($opts) if ( $sync );
-  $self->{store}->expire_old_tokens($opts) if ( $expire );
-  dbg("bayes: syncing complete");
+  if ($sync) {
+    dbg("bayes: bayes journal sync starting");
+    $self->{store}->sync($opts);
+    dbg("bayes: bayes journal sync completed");
+  }
+  if ($expire) {
+    dbg("bayes: expiry starting");
+    $self->{store}->expire_old_tokens($opts);
+    dbg("bayes: expiry completed");
+  }
 
   return 0;
 }