svn commit: r487590 - in /spamassassin/trunk: lib/Mail/SpamAssassin/Plugin.pm spamd/spamd.raw

[jm...@apache.org]

Author: jm
Date: Fri Dec 15 08:34:25 2006
New Revision: 487590

URL: http://svn.apache.org/viewvc?view=rev&rev=487590
Log:
bug 3808: send spamd 'result:' line to any listening plugins via new 'log_scan_result' plugin hook

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm
    spamassassin/trunk/spamd/spamd.raw

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm?view=diff&rev=487590&r1=487589&r2=487590
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin.pm Fri Dec 15 08:34:25 2006
@@ -770,6 +770,20 @@
 
 Called when a new child starts up under spamd.
 
+=item $plugin->log_scan_result ( { options ... } )
+
+Called when spamd has completed scanning a message.  Currently,
+only spamd calls this API.
+
+=over 4
+
+=item result
+
+The C<'result: ...'> line for this scan.  Format is as described
+at B<http://wiki.apache.org/spamassassin/SpamdSyslogFormat>.
+
+=back
+
 =item $plugin->spamd_child_post_connection_close ()
 
 Called when child returns from handling a connection.

Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamd/spamd.raw?view=diff&rev=487590&r1=487589&r2=487590
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Fri Dec 15 08:34:25 2006
@@ -1520,8 +1520,12 @@
   my $score = $status->get_score();
   my $tests = join(",", sort(grep(length,$status->get_names_of_tests_hit())));
 
-  info(sprintf("spamd: result: %s %2d - %s %s", $yorn, $score,
-	       $tests, join(",", @extra)));
+  my $log = sprintf("spamd: result: %s %2d - %s %s", $yorn, $score,
+	       $tests, join(",", @extra));
+  info($log);
+
+  # bug 3808: log scan results to any listening plugins, too
+  $spamtest->call_plugins("log_scan_result", { result => $log });
 
   $status->finish();    # added by jm to allow GC'ing
   $mail->finish();