You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/08/31 11:43:18 UTC
svn commit: r1866202 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Logger.pm
trunk/lib/Mail/SpamAssassin/Logger.pm
Author: hege
Date: Sat Aug 31 11:43:17 2019
New Revision: 1866202
URL: http://svn.apache.org/viewvc?rev=1866202&view=rev
Log:
Fix loglevel for duplicate logline suppressor
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger.pm?rev=1866202&r1=1866201&r2=1866202&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Logger.pm Sat Aug 31 11:43:17 2019
@@ -63,8 +63,9 @@ my %log_level = (
our %LOG_SA;
our $LOG_ENTERED; # to avoid recursion on die or warn from within logging
# duplicate message line suppressor
-our $LOG_DUPMIN = 10; # only start suppressing after x duplicate lines
+our $LOG_DUPMIN = 3; # only start suppressing after x duplicate lines
our $LOG_DUPLINE = ''; # remembers last log line
+our $LOG_DUPLEVEL = ''; # remembers last log level
our $LOG_DUPTIME; # remembers last log line timestamp
our $LOG_DUPCNT = 0; # counts duplicates
@@ -189,15 +190,16 @@ sub log_message {
if ($LOG_DUPCNT >= $LOG_DUPMIN) {
$LOG_DUPCNT -= $LOG_DUPMIN - 1;
if ($LOG_DUPCNT > 1) {
- _log_message($level,
+ _log_message($LOG_DUPLEVEL,
"$LOG_DUPLINE [... logline repeated $LOG_DUPCNT times]",
$LOG_DUPTIME);
} else {
- _log_message($level, $LOG_DUPLINE, $LOG_DUPTIME);
+ _log_message($LOG_DUPLEVEL, $LOG_DUPLINE, $LOG_DUPTIME);
}
}
$LOG_DUPCNT = 0;
$LOG_DUPLINE = $message;
+ $LOG_DUPLEVEL = $level;
}
_log_message($level, $message, $now);
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm?rev=1866202&r1=1866201&r2=1866202&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Logger.pm Sat Aug 31 11:43:17 2019
@@ -63,8 +63,9 @@ my %log_level = (
our %LOG_SA;
our $LOG_ENTERED; # to avoid recursion on die or warn from within logging
# duplicate message line suppressor
-our $LOG_DUPMIN = 10; # only start suppressing after x duplicate lines
+our $LOG_DUPMIN = 3; # only start suppressing after x duplicate lines
our $LOG_DUPLINE = ''; # remembers last log line
+our $LOG_DUPLEVEL = ''; # remembers last log level
our $LOG_DUPTIME; # remembers last log line timestamp
our $LOG_DUPCNT = 0; # counts duplicates
@@ -202,15 +203,16 @@ sub log_message {
if ($LOG_DUPCNT >= $LOG_DUPMIN) {
$LOG_DUPCNT -= $LOG_DUPMIN - 1;
if ($LOG_DUPCNT > 1) {
- _log_message($level,
+ _log_message($LOG_DUPLEVEL,
"$LOG_DUPLINE [... logline repeated $LOG_DUPCNT times]",
$LOG_DUPTIME);
} else {
- _log_message($level, $LOG_DUPLINE, $LOG_DUPTIME);
+ _log_message($LOG_DUPLEVEL, $LOG_DUPLINE, $LOG_DUPTIME);
}
}
$LOG_DUPCNT = 0;
$LOG_DUPLINE = $message;
+ $LOG_DUPLEVEL = $level;
}
_log_message($level, $message, $now);