[interchange-cvs] interchange - kwalsh modified 2 files

[interchange-cvs at icdevgroup.org]

User:      kwalsh
Date:      2008-02-05 16:44:51 GMT
Modified:  lib/Vend Config.pm Server.pm
Log:
    * New SocketReadTimeout global configuration directive to control the
      amount of time we will wait for data on a socket.  The default is
      one second, which is the same as the previously hard-coded timeout
      value.

Revision  Changes    Path
2.230     +3 -2      interchange/lib/Vend/Config.pm


rev 2.230, prev_rev 2.229
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.229
retrieving revision 2.230
diff -u -r2.229 -r2.230
--- Config.pm	3 Dec 2007 15:14:16 -0000	2.229
+++ Config.pm	5 Feb 2008 16:44:51 -0000	2.230
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.229 2007/12/03 15:14:16 mheins Exp $
+# $Id: Config.pm,v 2.230 2008/02/05 16:44:51 kwalsh Exp $
 #
 # Copyright (C) 2002-2007 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -54,7 +54,7 @@
 use Vend::Data;
 use Vend::Cron;
 
-$VERSION = substr(q$Revision: 2.229 $, 10);
+$VERSION = substr(q$Revision: 2.230 $, 10);
 
 my %CDname;
 my %CPname;
@@ -438,6 +438,7 @@
 	['PIDfile',     	 'root_dir',         "etc/$Global::ExeName.pid"],
 	['SocketFile',     	 'root_dir_array',   ''],
 	['SocketPerms',      'integer',          0600],
+	['SocketReadTimeout','integer',          1],
 	['SOAP',     	     'yesno',            'No'],
 	['SOAP_Socket',       'array',            ''],
 	['SOAP_Perms',        'integer',          0600],



2.87      +3 -3      interchange/lib/Vend/Server.pm


rev 2.87, prev_rev 2.86
Index: Server.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Server.pm,v
retrieving revision 2.86
retrieving revision 2.87
diff -u -r2.86 -r2.87
--- Server.pm	4 Feb 2008 21:42:18 -0000	2.86
+++ Server.pm	5 Feb 2008 16:44:51 -0000	2.87
@@ -1,6 +1,6 @@
 # Vend::Server - Listen for Interchange CGI requests as a background server
 #
-# $Id: Server.pm,v 2.86 2008/02/04 21:42:18 kwalsh Exp $
+# $Id: Server.pm,v 2.87 2008/02/05 16:44:51 kwalsh Exp $
 #
 # Copyright (C) 2002-2008 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.86 $, 10);
+$VERSION = substr(q$Revision: 2.87 $, 10);
 
 use Cwd;
 use POSIX qw(setsid strftime);
@@ -654,7 +654,7 @@
     vec($rin,fileno($fh),1) = 1;
 
     do {
-	if (($r = select($rin, undef, undef, 1)) > 0) {
+	if (($r = select($rin, undef, undef, $Global::SocketReadTimeout || 1)) > 0) {
 	    $r = sysread($fh, $$in, $r, length($$in));
 	}
     } while ((!defined($r) || $r == -1) && ($!{eintr} || $!{eagain}));