You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/01/30 00:01:31 UTC

svn commit: r501219 - in /spamassassin/trunk/lib/Mail/SpamAssassin: PerMsgStatus.pm Plugin.pm Plugin/Check.pm

Author: jm
Date: Mon Jan 29 15:01:29 2007
New Revision: 501219

URL: http://svn.apache.org/viewvc?view=rev&rev=501219
Log:
more efficient 'check_main'-implementation-required; change check_main API to return 1, and only if it returns undef (as it does when unimplemented), perform the have_plugin() call

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm?view=diff&rev=501219&r1=501218&r2=501219
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm Mon Jan 29 15:01:29 2007
@@ -157,11 +157,12 @@
 
   # The primary check functionality occurs via a plugin call.  For more
   # information, please see: Mail::SpamAssassin::Plugin::Check
-  $self->{main}->call_plugins ("check_main", { permsgstatus => $self });
-
-  # did anything happen?  if not, this is fatal
-  if (!$self->{score} && !$self->{main}->have_plugin("check_main")) {
-    die "check: no loaded plugin implements 'check_main': cannot scan!";
+  if (!$self->{main}->call_plugins ("check_main", { permsgstatus => $self }))
+  {
+    # did anything happen?  if not, this is fatal
+    if (!$self->{main}->have_plugin("check_main")) {
+      die "check: no loaded plugin implements 'check_main': cannot scan!";
+    }
   }
 
   # delete temporary storage and memory allocation used during checking

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm?view=diff&rev=501219&r1=501218&r2=501219
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm Mon Jan 29 15:01:29 2007
@@ -331,7 +331,8 @@
 
 =item $plugin->check_main ( { options ... } )
 
-Signals that a message should be checked.
+Signals that a message should be checked.  Note that implementations of
+this hook should return C<1>.
 
 =over 4
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm?view=diff&rev=501219&r1=501218&r2=501219
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm Mon Jan 29 15:01:29 2007
@@ -142,7 +142,7 @@
   $pms->learn();
   $self->{main}->call_plugins ("check_post_learn", { permsgstatus => $pms });
 
-  return;
+  return 1;
 }
 
 sub finish_tests {