svn commit: r1074254 - in /spamassassin/trunk/lib/Mail/SpamAssassin: DnsResolver.pm Timeout.pm

[mm...@apache.org]

Author: mmartinec
Date: Thu Feb 24 18:43:41 2011
New Revision: 1074254

URL: http://svn.apache.org/viewvc?rev=1074254&view=rev
Log:
- change a warn("dns: select interrupted") into info();
- Timeout.pm: add caller info into an alarm signal id
  to facilitate troubleshooting of timeouts

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm?rev=1074254&r1=1074253&r2=1074254&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm Thu Feb 24 18:43:41 2011
@@ -622,7 +622,7 @@ sub poll_responses {
     }
     if (!defined $nfound || $nfound < 0) {
       if ($!) { warn "dns: select failed: $!\n" }
-      else    { warn "dns: select interrupted\n" }
+      else    { info("dns: select interrupted") }
       return;
     } elsif (!$nfound) {
       if (!defined $timeout) { warn("dns: select returned empty-handed\n") }

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm?rev=1074254&r1=1074253&r2=1074254&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Timeout.pm Thu Feb 24 18:43:41 2011
@@ -98,7 +98,9 @@ sub new {
   my ($class, $opts) = @_;
   $class = ref($class) || $class;
   my %selfval = $opts ? %{$opts} : ();
-  $selfval{id} = ++$id_gen;
+  my($package, $filename, $line, $subroutine) = caller(1);
+  $subroutine =~ s/^Mail::SpamAssassin::/::/;
+  $selfval{id} = join('/', ++$id_gen, $subroutine, $line);
   my $self = \%selfval;
 
   bless ($self, $class);