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

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Thu Aug 9 11:10:10 EDT 2007


User:      racke
Date:      2007-08-09 15:10:10 GMT
Modified:  lib/Vend Server.pm
Log:
delay server started message as long as possible
disable soap and print warning on stdout if Vend::SOAP fails to load (#46)

Revision  Changes    Path
2.77      +15 -10    interchange/lib/Vend/Server.pm


rev 2.77, prev_rev 2.76
Index: Server.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Server.pm,v
retrieving revision 2.76
retrieving revision 2.77
diff -u -r2.76 -r2.77
--- Server.pm	9 Aug 2007 13:20:01 -0000	2.76
+++ Server.pm	9 Aug 2007 15:10:10 -0000	2.77
@@ -1,6 +1,6 @@
 # Vend::Server - Listen for Interchange CGI requests as a background server
 #
-# $Id: Server.pm,v 2.76 2007/08/09 13:20:01 mheins Exp $
+# $Id: Server.pm,v 2.77 2007/08/09 15:10:10 racke Exp $
 #
 # Copyright (C) 2002-2007 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.76 $, 10);
+$VERSION = substr(q$Revision: 2.77 $, 10);
 
 use Cwd;
 use POSIX qw(setsid strftime);
@@ -2209,12 +2209,16 @@
 		};
 		if($@) {
 			::logGlobal( {
-				level => 'warn' },
-				"SOAP enabled, but Vend::SOAP will not load: %s",
+				level => 'info' },
 				$@,
 			);
-		}
-		else {
+			::logGlobal( {
+				level => 'warn' },
+				"SOAP enabled, but Vend::SOAP failed to load."
+			);
+			print "SOAP enabled, but Vend::SOAP failed to load.\n";
+			$Global::SOAP = 0;
+		} else {
 			my @made;
 			my @unix_soap = grep m{/}, @{$Global::SOAP_Socket};
 			my @inet_soap = grep $_ !~ m{/}, @{$Global::SOAP_Socket};
@@ -2271,6 +2275,11 @@
 
 	::logGlobal({ level => 'info' }, server_start_message() );
 
+	print server_start_message(
+		"Interchange server started in %s mode(s) (process id %s)\n",
+		1,
+	) unless $Vend::Quiet;
+
 	my $no_fork;
 	if($Global::Windows or $Global::DEBUG ) {
 		$no_fork = 1;
@@ -2813,10 +2822,6 @@
 						);
                     exit 1;
                 }
-                print server_start_message(
-						"Interchange server started in %s mode(s) (process id %s)\n",
-						1,
-					 ) unless $Vend::Quiet;
 
                 setsid();
 








More information about the interchange-cvs mailing list