[interchange-cvs] interchange - racke modified 2 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Mon Feb 25 05:02:31 EST 2008
User: racke
Date: 2008-02-25 10:02:31 GMT
Modified: lib/Vend Config.pm Dispatch.pm
Log:
we can now force global jobs into catalogs, e.g. for maintenance jobs
Revision Changes Path
2.233 +3 -3 interchange/lib/Vend/Config.pm
rev 2.233, prev_rev 2.232
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.232
retrieving revision 2.233
diff -u -r2.232 -r2.233
--- Config.pm 14 Feb 2008 16:29:48 -0000 2.232
+++ Config.pm 25 Feb 2008 10:02:30 -0000 2.233
@@ -1,6 +1,6 @@
# Vend::Config - Configure Interchange
#
-# $Id: Config.pm,v 2.232 2008/02/14 16:29:48 racke Exp $
+# $Id: Config.pm,v 2.233 2008/02/25 10:02:30 racke Exp $
#
# Copyright (C) 2002-2008 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.232 $, 10);
+$VERSION = substr(q$Revision: 2.233 $, 10);
my %CDname;
my %CPname;
@@ -453,7 +453,7 @@
['SOAP_MaxRequests', 'integer', 50],
['SOAP_StartServers', 'integer', 1],
['SOAP_Control', 'action', ''],
- ['Jobs', 'hash', 'MaxLifetime 600 MaxServers 1'],
+ ['Jobs', 'hash', 'MaxLifetime 600 MaxServers 1 UseGlobal 0'],
['IPCsocket', 'root_dir', 'etc/socket.ipc'],
['HouseKeeping', 'time', 60],
['HouseKeepingCron', 'cron', ''],
1.95 +3 -3 interchange/lib/Vend/Dispatch.pm
rev 1.95, prev_rev 1.94
Index: Dispatch.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Dispatch.pm,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- Dispatch.pm 15 Feb 2008 23:50:52 -0000 1.94
+++ Dispatch.pm 25 Feb 2008 10:02:30 -0000 1.95
@@ -1,6 +1,6 @@
# Vend::Dispatch - Handle Interchange page requests
#
-# $Id: Dispatch.pm,v 1.94 2008/02/15 23:50:52 racke Exp $
+# $Id: Dispatch.pm,v 1.95 2008/02/25 10:02:30 racke Exp $
#
# Copyright (C) 2002-2008 Interchange Development Group
# Copyright (C) 2002 Mike Heins <mike at perusion.net>
@@ -26,7 +26,7 @@
package Vend::Dispatch;
use vars qw($VERSION);
-$VERSION = substr(q$Revision: 1.94 $, 10);
+$VERSION = substr(q$Revision: 1.95 $, 10);
use POSIX qw(strftime);
use Vend::Util;
@@ -731,7 +731,7 @@
my ($d, $global_dir, $tmp);
my @jobdirs = ([$jobscfg->{base_directory} || 'etc/jobs', 0]);
- if (is_yes($jobscfg->{use_global})) {
+ if (is_yes($jobscfg->{use_global}) || is_yes($Global::Jobs->{UseGlobal})) {
push (@jobdirs, ["$Global::ConfDir/jobs", 1]);
}
More information about the interchange-cvs
mailing list