svn commit: r1437629 - /spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm

[mm...@apache.org]

Author: mmartinec
Date: Wed Jan 23 19:05:24 2013
New Revision: 1437629

URL: http://svn.apache.org/viewvc?rev=1437629&view=rev
Log:
more informative warnings on dns socket troubles

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm?rev=1437629&r1=1437628&r2=1437629&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/DnsResolver.pm Wed Jan 23 19:05:24 2013
@@ -354,7 +354,9 @@ sub connect_sock {
     or die "No Perl modules for network socket available";
 
   if ($self->{sock}) {
-    $self->{sock}->close()  or die "error closing socket: $!";
+    $self->{sock}->close()
+      or warn "connect_sock: error closing socket $self->{sock}: $!";
+    $self->{sock} = undef;
   }
   my $sock;
   my $errno;
@@ -857,7 +859,8 @@ Reset socket when done with it.
 sub finish_socket {
   my ($self) = @_;
   if ($self->{sock}) {
-    $self->{sock}->close()  or warn "error closing socket: $!";
+    $self->{sock}->close()
+      or warn "finish_socket: error closing socket $self->{sock}: $!";
     undef $self->{sock};
   }
 }