svn commit: rev 30702 - spamassassin/trunk/spamd

[ms...@apache.org]

Author: mss
Date: Sun Jul 25 16:40:03 2004
New Revision: 30702

Modified:
   spamassassin/trunk/spamd/spamd.raw
Log:
Another rather trivial change to add some debugging output before sockets are established. Should help a lot to track down stuff like <http://bugs.gentoo.org/show_bug.cgi?id=58122>.

The whole code around there is currently a real mess, I'll refactor it for 3.1.


Modified: spamassassin/trunk/spamd/spamd.raw
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw	(original)
+++ spamassassin/trunk/spamd/spamd.raw	Sun Jul 25 16:40:03 2004
@@ -596,12 +596,14 @@
     }
   }
 
-  $server = new IO::Socket::UNIX(
+  my %socket = (
     Local  => $path,
     Type   => SOCK_STREAM,
-    Listen => SOMAXCONN
-    )
-    || die "Could not create UNIX socket on $path: $! ($@)\n";
+    Listen => SOMAXCONN,
+  );
+  warn("creating UNIX socket:\n" . join("\n", map { "\t$_: " . (defined $socket{$_} ? $socket{$_} : "(undef)") } sort keys %socket) . "\n") if $opt{'debug'};
+  $server = new IO::Socket::UNIX(%socket)
+         || die "Could not create UNIX socket on $path: $! ($@)\n";
 
   my $mode = $opt{socketmode};
   if ($mode) {
@@ -635,7 +637,7 @@
   }
 }
 elsif ( $opt{'ssl'} ) {
-  $server = new IO::Socket::SSL(
+  my %socket = (
     LocalAddr       => $addr,
     LocalPort       => $port,
     Proto           => $proto,
@@ -645,19 +647,23 @@
     SSL_verify_mode => 0x00,
     SSL_key_file    => $opt{'server-key'},
     SSL_cert_file   => $opt{'server-cert'}
-    )
-    || die "Could not create SSL socket: $! ($@)\n";
+  );
+  warn("creating SSL socket:\n" . join("\n", map { "\t$_:  " . (defined $socket{$_} ? $socket{$_} : "(undef)") } sort keys %socket) . "\n") if $opt{'debug'};
+  $server = new IO::Socket::SSL(%socket)
+         || die "Could not create SSL socket on $addr:$port: $! ($@)\n";
 }
 else {
-  $server = new IO::Socket::INET(
+  my %socket = (
     LocalAddr => $addr,
     LocalPort => $port,
     Proto     => $proto,
     Type      => SOCK_STREAM,
     ReuseAddr => 1,
     Listen    => SOMAXCONN
-    )
-    || die "Could not create INET socket: $! ($@)\n";
+  );
+  warn("creating INET socket:\n" . join("\n", map { "\t$_: " . (defined $socket{$_} ? $socket{$_} : "(undef)") } sort keys %socket) . "\n") if $opt{'debug'};
+  $server = new IO::Socket::INET(%socket)
+         || die "Could not create INET socket on $addr:$port: $! ($@)\n";
 }
 
 if ( defined $opt{'pidfile'} ) {