[interchange-cvs] [SCM] Interchange branch, master, updated. 71493ef3ef84bb231f4fcd45872fef1051e81d22

[Jon Jensen]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".

The branch, master has been updated
       via  71493ef3ef84bb231f4fcd45872fef1051e81d22 (commit)
      from  35b93fc3e64eadaf714b346b0adde5941ebec434 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 71493ef3ef84bb231f4fcd45872fef1051e81d22
Author: Jon Jensen <jon at endpoint.com>
Date:   Thu Jun 25 13:54:17 2009 +0200

    Allow Interchange daemon to start with no Catalog declarations
    
    When you start Interchange without specifying a SocketFile and also
    no Catalog directives in interchange.cfg, the daemon dies with this
    seemingly unrelated error:
    
    No sockets -- INTERCHANGE SERVER TERMINATING
    
    That was because the default @$Global::SocketFile array happened to be
    populated by the catalog postprocessing routines, which are never called
    when no catalog is defined.
    
    We (Stefan, Davor, and I) moved this default setting to
    &Vend::Server::run_server instead, which ensures it always runs, and the
    Interchange daemon can start without any catalogs.

-----------------------------------------------------------------------

Summary of changes and diff:
 lib/Vend/Config.pm |    7 -------
 lib/Vend/Server.pm |    5 +++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/Vend/Config.pm b/lib/Vend/Config.pm
index c6d7b41..88f2915 100644
--- a/lib/Vend/Config.pm
+++ b/lib/Vend/Config.pm
@@ -1,7 +1,5 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.246 2009-04-16 16:58:31 mheins Exp $
-#
 # Copyright (C) 2002-2009 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
 #
@@ -3506,11 +3504,6 @@ sub set_default_search {
 						if $Global::SOAP and ! $Global::SOAP_Socket;
 					return 1;
 				},
-		SocketFile => sub {
-					@$Global::SocketFile = "$Global::VendRoot/etc/socket"
-						unless @$Global::SocketFile and $Global::SocketFile->[0];
-					return 1;
-				},
 		TcpMap => sub {
 					return 1 if defined $Have_set_global_defaults;
 					my (@sets) = keys %{$Global::TcpMap};
diff --git a/lib/Vend/Server.pm b/lib/Vend/Server.pm
index ed5a1fb..aa9c669 100644
--- a/lib/Vend/Server.pm
+++ b/lib/Vend/Server.pm
@@ -1,7 +1,5 @@
 # Vend::Server - Listen for Interchange CGI requests as a background server
 #
-# $Id: Server.pm,v 2.104 2009-03-27 11:09:48 markj Exp $
-#
 # Copyright (C) 2002-2009 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
 #
@@ -2930,6 +2928,9 @@ sub run_server {
     my $next;
 #::logDebug("trying to run server");
 
+	@$Global::SocketFile = "$Global::VendRoot/etc/socket"
+		unless @$Global::SocketFile and $Global::SocketFile->[0];
+
 	if($Global::Variable->{MV_GETPPID_BROKEN}) {
 #::logDebug("setting getppid broken");
 		my $num = $Global::Variable->{MV_GETPPID_BROKEN} > 1


hooks/post-receive
-- 
Interchange