[interchange-cvs] interchange - racke modified lib/Vend/Server.pm

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2006-07-12 10:28:29 GMT
Modified:  lib/Vend Server.pm
Log:
map_inet_socket is used by SOAP server as well, so we need to include the
actual mode in the error message
also add IP address we try to bind on, which might be causing the failure

Revision  Changes    Path
2.69      +7 -6      interchange/lib/Vend/Server.pm


rev 2.69, prev_rev 2.68
Index: Server.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Server.pm,v
retrieving revision 2.68
retrieving revision 2.69
diff -u -r2.68 -r2.69
--- Server.pm	2 Jul 2006 17:35:11 -0000	2.68
+++ Server.pm	12 Jul 2006 10:28:29 -0000	2.69
@@ -1,6 +1,6 @@
 # Vend::Server - Listen for Interchange CGI requests as a background server
 #
-# $Id: Server.pm,v 2.68 2006/07/02 17:35:11 racke Exp $
+# $Id: Server.pm,v 2.69 2006/07/12 10:28:29 racke Exp $
 #
 # Copyright (C) 2002-2005 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -26,7 +26,7 @@
 package Vend::Server;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 2.68 $, 10);
+$VERSION = substr(q$Revision: 2.69 $, 10);
 
 use Cwd;
 use POSIX qw(setsid strftime);
@@ -1463,7 +1463,7 @@
 }
 
 sub map_inet_socket {
-	my ($vec, $vec_map, $fh_map, @ports) = @_;
+	my ($mode, $vec, $vec_map, $fh_map, @ports) = @_;
 
 	my $proto = getprotobyname('tcp');
 	my @made;
@@ -1514,7 +1514,8 @@
 
 		if ($@) {
 		  ::logGlobal({ level => 'error' },
-					"INET mode server failed to start on port %s: %s",
+					"$mode mode server failed to start on IP address %s, port %s: %s",
+					$bind_ip,
 					$bind_port,
 					$@,
 				  );
@@ -2218,7 +2219,7 @@
 			}
 			if(@inet_soap) {
 				push @made,
-					map_inet_socket(\$s_vector, \%s_vec_map, \%s_fh_map, @inet_soap);
+					map_inet_socket('SOAP', \$s_vector, \%s_vec_map, \%s_fh_map, @inet_soap);
 			}
 		}
 	}
@@ -2234,7 +2235,7 @@
 				$Global::TcpHost,
 				);
 		my @made =
-			map_inet_socket(\$vector, \%vec_map, \%fh_map, keys %{$Global::TcpMap});
+			map_inet_socket('TCP', \$vector, \%vec_map, \%fh_map, keys %{$Global::TcpMap});
 		if (! scalar @made) {
 			my $msg;
 			if ($Global::Unix_Mode) {