svn commit: r1843249 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm

[he...@apache.org]

Author: hege
Date: Tue Oct  9 12:42:51 2018
New Revision: 1843249

URL: http://svn.apache.org/viewvc?rev=1843249&view=rev
Log:
Use eval_to_rule to adjust rule priorities

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm?rev=1843249&r1=1843248&r2=1843249&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Razor2.pm Tue Oct  9 12:42:51 2018
@@ -397,11 +397,17 @@ sub finish_parsing_start {
   my ($self, $opts) = @_;
 
   # If forking, hard adjust priority -100 to launch early
+  # Find rulenames from eval_to_rule mappings
   if ($opts->{conf}->{razor_fork}) {
-    # Ugly hardcoded names, but iterating through {tests}
-    # looking for these is silly expensive. Works for most.
-    foreach ('RAZOR2_CHECK','RAZOR2_CF_RANGE_51_100') {
+    foreach (@{$opts->{conf}->{eval_to_rule}->{check_razor2}}) {
       if (exists $opts->{conf}->{tests}->{$_}) {
+        dbg("razor2: adjusting rule $_ priority to -100");
+        $opts->{conf}->{priority}->{$_} = -100;
+      }
+    }
+    foreach (@{$opts->{conf}->{eval_to_rule}->{check_razor2_range}}) {
+      if (exists $opts->{conf}->{tests}->{$_}) {
+        dbg("razor2: adjusting rule $_ priority to -100");
         $opts->{conf}->{priority}->{$_} = -100;
       }
     }