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

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Thu Feb 6 15:27:00 2003


User:      heins
Date:      2003-02-06 20:26:29 GMT
Modified:  lib/Vend Server.pm
Log:
* Allow systems with broken locks to not destroy the pidfile lock
  by reading the file. Alleviates inability to use "interchange -stop".
  Requires setting

	Variable MV_BAD_LOCK 1

  in interchange.cfg.

  Thanks to Daniel Hutchinson for finding the problem!

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


rev 2.27, prev_rev 2.26
Index: Server.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Server.pm,v
retrieving revision 2.26
retrieving revision 2.27
diff -u -r2.26 -r2.27
--- Server.pm	2 Feb 2003 21:04:22 -0000	2.26
+++ Server.pm	6 Feb 2003 20:26:29 -0000	2.27
@@ -1,6 +1,6 @@
 # Vend::Server - Listen for Interchange CGI requests as a background server
 #
-# $Id: Server.pm,v 2.26 2003/02/02 21:04:22 racke Exp $
+# $Id: Server.pm,v 2.27 2003/02/06 20:26:29 mheins Exp $
 #
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -25,7 +25,7 @@
 package Vend::Server;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 2.26 $, 10);
+$VERSION = substr(q$Revision: 2.27 $, 10);
 
 use POSIX qw(setsid strftime);
 use Vend::Util;
@@ -1200,7 +1200,7 @@
 	push (@types, 'SOAP') if $Global::SOAP;
 	push (@types, 'mod_perl') if $Global::mod_perl;
 	my $server_type = join(" and ", @types);
-	my $pid = read_pidfile();
+	my $pid = $Global::Variable->{MV_BAD_LOCK} ? $$ : read_pidfile();
 	my @args = $reverse ? ($server_type, $pid) : ($pid, $server_type);
 	return ::errmsg ($fmt , @args );
 }