svn commit: r1900725 - /spamassassin/trunk/lib/Mail/SpamAssassin/AsyncLoop.pm

[he...@apache.org]

Author: hege
Date: Mon May  9 09:11:43 2022
New Revision: 1900725

URL: http://svn.apache.org/viewvc?rev=1900725&view=rev
Log:
Improve logging

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=1900725&r1=1900724&r2=1900725&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/AsyncLoop.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/AsyncLoop.pm Mon May  9 09:11:43 2022
@@ -318,7 +318,7 @@ sub bgsend_and_start_lookup {
     if ($blocked) {
       dbg("async: blocked by %s: %s", $blocked_by, $dnskey);
     } else {
-      dbg("async: launching %s for %s", $dnskey, $key);
+      dbg("async: launching %s", $dnskey);
       $id = $self->{main}->{resolver}->bgsend($domain, $type, $class, sub {
           my($pkt, $pkt_id, $timestamp) = @_;
           # this callback sub is called from DnsResolver::poll_responses()
@@ -662,8 +662,10 @@ sub abort_remaining_lookups {
     foreach my $tuple (@{$dns_query_info->{applicants}}) {
       my($ent, $cb) = @$tuple;
       if ($cb) {
-        dbg("async: calling callback/abort on key %s%s", $dnskey,
-            !defined $ent->{rulename} ? '' : ", rule ".$ent->{rulename});
+        my @rulenames = grep { defined } (ref $ent->{rulename} ?
+                  @{$ent->{rulename}} : $ent->{rulename});
+        dbg("async: calling callback/abort on key %s, rules: %s", $dnskey,
+            join(", ", @rulenames));
         $cb_count++;
         eval {
           $cb->($ent, undef); 1;