svn commit: r1842478 - in /spamassassin/trunk: UPGRADE lib/Mail/SpamAssassin/Plugin.pm lib/Mail/SpamAssassin/Plugin/Check.pm

[he...@apache.org]

Author: hege
Date: Mon Oct  1 11:59:01 2018
New Revision: 1842478

URL: http://svn.apache.org/viewvc?rev=1842478&view=rev
Log:
New plugin callback method check_cleanup()

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

Modified: spamassassin/trunk/UPGRADE
URL: http://svn.apache.org/viewvc/spamassassin/trunk/UPGRADE?rev=1842478&r1=1842477&r2=1842478&view=diff
==============================================================================
--- spamassassin/trunk/UPGRADE (original)
+++ spamassassin/trunk/UPGRADE Mon Oct  1 11:59:01 2018
@@ -26,6 +26,8 @@ Note for Users Upgrading to SpamAssassin
   Utilized by RelayCountry and URILocalBL. Settings geodb_module, geodb_options,
   geodb_search_path.
 
+- new plugin callback method check_cleanup
+
 
 
 Note for Users Upgrading to SpamAssassin 3.4.2

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm?rev=1842478&r1=1842477&r2=1842478&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm Mon Oct  1 11:59:01 2018
@@ -440,6 +440,21 @@ The C<Mail::SpamAssassin::PerMsgStatus>
 
 =back
 
+=item $plugin->check_cleanup ( { options ... } )
+
+Called just before message check is finishing and before possible
+auto-learning.  This is guaranteed to be always called, unlike check_tick
+and check_post_dnsbl.  Used for cleaning up left callbacks or forked
+children etc, last chance to make rules hit.
+
+=over 4
+
+=item permsgstatus
+
+The C<Mail::SpamAssassin::PerMsgStatus> context object for this scan.
+
+=back
+
 =item $plugin->check_post_learn ( { options ... } )
 
 Called after auto-learning may (or may not) have taken place.  If you

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm?rev=1842478&r1=1842477&r2=1842478&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm Mon Oct  1 11:59:01 2018
@@ -231,6 +231,9 @@ sub check_main {
     }
   }
 
+  # last chance to handle left callbacks, make rule hits etc
+  $self->{main}->call_plugins ("check_cleanup", { permsgstatus => $pms });
+
   if ($pms->{deadline_exceeded}) {
   # dbg("check: exceeded time limit, skipping auto-learning");
   } elsif ($master_deadline && time > $master_deadline) {