svn commit: r1910294 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm

[he...@apache.org]

Author: hege
Date: Thu Jun  8 07:23:41 2023
New Revision: 1910294

URL: http://svn.apache.org/viewvc?rev=1910294&view=rev
Log:
Clean up code and improve logging

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm?rev=1910294&r1=1910293&r2=1910294&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDetail.pm Thu Jun  8 07:23:41 2023
@@ -156,14 +156,13 @@ sub set_config {
 sub check_uri_detail {
   my ($self, $permsg) = @_;
 
+  my $test = $permsg->{current_rule_name}; 
+  my $rule = $permsg->{conf}->{uri_detail}->{$test};
+
   my %uri_detail = %{ $permsg->get_uri_detail_list() };
 
   while (my ($raw, $info) = each %uri_detail) {
-    my $test = $permsg->{current_rule_name}; 
-
-    dbg("uri: running $test\n");
-
-    my $rule = $permsg->{conf}->{uri_detail}->{$test};
+    dbg("uri: running uri_detail $test: $raw");
 
     if (exists $rule->{raw}) {
       my($op,$patt) = @{$rule->{raw}};
@@ -235,13 +234,7 @@ sub check_uri_detail {
       dbg("uri: host matched: '%s' %s /%s/", $match,$op,$patt);
     }
 
-    if (would_log('dbg', 'rules') > 1) {
-      dbg("uri: criteria for $test met");
-    }
-    
-    # reset hash
-    keys %uri_detail;
-
+    dbg("uri: all criteria for $test met - HIT");
     return 1;
   }