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/30 08:35:57 UTC
svn commit: r1866135 - /spamassassin/trunk/lib/Mail/SpamAssassin/AsyncLoop.pm
Author: hege
Date: Fri Aug 30 08:35:57 2019
New Revision: 1866135
URL: http://svn.apache.org/viewvc?rev=1866135&view=rev
Log:
Reduce DNS abort logging level when shortcircuiting etc
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/AsyncLoop.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/AsyncLoop.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/AsyncLoop.pm?rev=1866135&r1=1866134&r2=1866135&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/AsyncLoop.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/AsyncLoop.pm Fri Aug 30 08:35:57 2019
@@ -674,14 +674,15 @@ sub abort_remaining_lookups {
$self->{pending_rules} = {};
while (my($key,$ent) = each %$pending) {
- info("async: aborting after %.3f s, %s: %s",
- $now - $ent->{start_time},
+ my $dur = $now - $ent->{start_time};
+ my $msg = sprintf( "async: aborting after %.3f s, %s: %s", $dur,
(defined $ent->{timeout_initial} &&
$now > $ent->{start_time} + $ent->{timeout_initial}
? 'past original deadline' : 'deadline shrunk'),
$ent->{display_id} );
+ $dur > 1 ? info($msg) : dbg($msg);
$foundcnt++;
- $self->{timing_by_query}->{"X $key"} = $now - $ent->{start_time};
+ $self->{timing_by_query}->{"X $key"} = $dur;
$ent->{finish_time} = $now if !defined $ent->{finish_time};
delete $pending->{$key};
}