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

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2003-12-10 21:35:43 GMT
Modified:  lib/Vend Server.pm
Log:
* Change wrong logic in server_start_message() -- it always needs to
  be $$ when in PreFork mode.

Revision  Changes    Path
2.43      +5 -3      interchange/lib/Vend/Server.pm


rev 2.43, prev_rev 2.42
Index: Server.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Server.pm,v
retrieving revision 2.42
retrieving revision 2.43
diff -u -r2.42 -r2.43
--- Server.pm	6 Dec 2003 20:25:35 -0000	2.42
+++ Server.pm	10 Dec 2003 21:35:43 -0000	2.43
@@ -1,6 +1,6 @@
 # Vend::Server - Listen for Interchange CGI requests as a background server
 #
-# $Id: Server.pm,v 2.42 2003/12/06 20:25:35 jon Exp $
+# $Id: Server.pm,v 2.43 2003/12/10 21:35:43 mheins Exp $
 #
 # Copyright (C) 2002-2003 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.42 $, 10);
+$VERSION = substr(q$Revision: 2.43 $, 10);
 
 use POSIX qw(setsid strftime);
 use Vend::Util;
@@ -1318,7 +1318,9 @@
 	push (@types, 'SOAP') if $Global::SOAP;
 	push (@types, 'mod_perl') if $Global::mod_perl;
 	my $server_type = join(" and ", @types);
-	my $pid = $Global::Variable->{MV_BAD_LOCK} ? $$ : read_pidfile();
+	my $pid = ( $Global::PreFork || $Global::Variable->{MV_BAD_LOCK} )
+			  ? $$
+			  : read_pidfile();
 	my @args = $reverse ? ($server_type, $pid) : ($pid, $server_type);
 	return ::errmsg ($fmt , @args );
 }