svn commit: r1843243 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Logger.pm Plugin/Check.pm

[he...@apache.org]

Author: hege
Date: Tue Oct  9 12:23:35 2018
New Revision: 1843243

URL: http://svn.apache.org/viewvc?rev=1843243&view=rev
Log:
Some would_log optimizations

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm?rev=1843243&r1=1843242&r2=1843243&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm Tue Oct  9 12:23:35 2018
@@ -332,17 +332,17 @@ The facility argument is optional.
 sub would_log {
   my ($level, $facility) = @_;
 
-  if ($level eq "info") {
-    return $LOG_SA{level} >= INFO;
-  }
-  if ($level eq "dbg") {
+  if ($level eq 'dbg') {
     return 0 if $LOG_SA{level} < DBG;
     return 1 if !$facility;
     return ($LOG_SA{facility}->{$facility} ? 2 : 0)
       if exists $LOG_SA{facility}->{$facility};
     return 1 if $LOG_SA{facility}->{all};
     return 0;
+  } elsif ($level eq 'info') {
+    return $LOG_SA{level} >= INFO;
   }
+
   warn "logger: would_log called with unknown level: $level\n";
   return 0;
 }

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm?rev=1843243&r1=1843242&r2=1843243&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Check.pm Tue Oct  9 12:23:35 2018
@@ -816,6 +816,9 @@ sub do_body_tests {
   my ($self, $pms, $priority, $textary) = @_;
   my $loopid = 0;
 
+  # this is called often, cache
+  my $would_log_rules_all = would_log('dbg', 'rules-all') == 2;
+
   $self->run_generic_tests ($pms, $priority,
     consttype => $Mail::SpamAssassin::Conf::TYPE_BODY_TESTS,
     type => 'body',
@@ -826,7 +829,7 @@ sub do_body_tests {
     my ($self, $pms, $conf, $rulename, $pat, %opts) = @_;
     $pat = untaint_var($pat);  # presumably checked
     my $sub = '';
-    if (would_log('dbg', 'rules-all') == 2) {
+    if ($would_log_rules_all) {
       $sub .= '
       dbg("rules-all: running body rule %s", q{'.$rulename.'});
       ';
@@ -898,6 +901,10 @@ sub do_body_tests {
 sub do_uri_tests {
   my ($self, $pms, $priority, @uris) = @_;
   my $loopid = 0;
+
+  # this is called often, cache
+  my $would_log_rules_all = would_log('dbg', 'rules-all') == 2;
+
   $self->run_generic_tests ($pms, $priority,
     consttype => $Mail::SpamAssassin::Conf::TYPE_URI_TESTS,
     type => 'uri',
@@ -908,7 +915,7 @@ sub do_uri_tests {
     my ($self, $pms, $conf, $rulename, $pat, %opts) = @_;
     $pat = untaint_var($pat);  # presumably checked
     my $sub = '';
-    if (would_log('dbg', 'rules-all') == 2) {
+    if ($would_log_rules_all) {
       $sub .= '
       dbg("rules-all: running uri rule %s", q{'.$rulename.'});
       ';