[interchange-cvs] interchange - racke modified 2 files

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2003-07-31 19:33:41 GMT
Modified:  lib/Vend Control.pm Server.pm
Log:
changed name of jobs queue from jobs to jobsqueue to avoid conflict
with existing jobs directory

Revision  Changes    Path
2.10      +2 -2      interchange/lib/Vend/Control.pm


rev 2.10, prev_rev 2.9
Index: Control.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Control.pm,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -r2.9 -r2.10
--- Control.pm	29 Jul 2003 00:12:39 -0000	2.9
+++ Control.pm	31 Jul 2003 19:33:40 -0000	2.10
@@ -1,6 +1,6 @@
 # Vend::Control - Routines that alter the running Interchange daemon
 # 
-# $Id: Control.pm,v 2.9 2003/07/29 00:12:39 racke Exp $
+# $Id: Control.pm,v 2.10 2003/07/31 19:33:40 racke Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -68,7 +68,7 @@
 	$job =~ s/^,+//;
 	$job =~ s/,+$//;
 	$Vend::JobsJob = $job;
-	Vend::Util::writefile("$Global::RunDir/jobs", "jobs $cat $delay $job\n");
+	Vend::Util::writefile("$Global::RunDir/jobsqueue", "jobs $cat $delay $job\n");
 #::logGlobal("signal_jobs: wrote file, ready to control_interchange");
 	control_interchange('jobs', 'HUP');
 }



2.39      +14 -14    interchange/lib/Vend/Server.pm


rev 2.39, prev_rev 2.38
Index: Server.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Server.pm,v
retrieving revision 2.38
retrieving revision 2.39
diff -u -r2.38 -r2.39
--- Server.pm	27 Jul 2003 16:06:53 -0000	2.38
+++ Server.pm	31 Jul 2003 19:33:40 -0000	2.39
@@ -1,6 +1,6 @@
 # Vend::Server - Listen for Interchange CGI requests as a background server
 #
-# $Id: Server.pm,v 2.38 2003/07/27 16:06:53 racke Exp $
+# $Id: Server.pm,v 2.39 2003/07/31 19:33:40 racke 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.38 $, 10);
+$VERSION = substr(q$Revision: 2.39 $, 10);
 
 use POSIX qw(setsid strftime);
 use Vend::Util;
@@ -1017,7 +1017,7 @@
 		($reconfig) = grep $_ eq 'reconfig', @files;
 		($restart) = grep $_ eq 'restart', @files
 			if $Signal_Restart || $Global::Windows;
-		($jobs) = grep $_ eq 'jobs', @files;
+		($jobs) = grep $_ eq 'jobsqueue', @files;
 		if($Global::PIDcheck) {
 			$Num_servers = 0;
 			@pids = grep /^pid\.\d+$/, @files;
@@ -1126,10 +1126,10 @@
 		}
 		if (defined $jobs) {
 			my (@scheduled_jobs, @queued_jobs);
-			open(Vend::Server::JOBS, "+<$Global::RunDir/jobs")
-				or die "open $Global::RunDir/jobs: $!\n";
+			open(Vend::Server::JOBS, "+<$Global::RunDir/jobsqueue")
+				or die "open $Global::RunDir/jobsqueue: $!\n";
 			lockfile(\*Vend::Server::JOBS, 1, 1)
-				or die "lock $Global::RunDir/jobs: $!\n";
+				or die "lock $Global::RunDir/jobsqueue: $!\n";
 			while(<Vend::Server::JOBS>) {
 				chomp;
 				my ($directive,$value) = split /\s+/, $_, 2;
@@ -1153,24 +1153,24 @@
 			}
 
 			truncate(Vend::Server::JOBS, 0)
-				or die "truncate $Global::RunDir/jobs: $!\n";
+				or die "truncate $Global::RunDir/jobsqueue: $!\n";
             seek(Vend::Server::JOBS, 0, 0)
-                or die "seek $Global::RunDir/jobs: $!\n";
+                or die "seek $Global::RunDir/jobsqueue: $!\n";
 
             if (@queued_jobs) {
 #::logDebug("Size of queue $$: %s", scalar(@queued_jobs));
 				print Vend::Server::JOBS join("\n", @queued_jobs, '');
                 unlockfile(\*Vend::Server::JOBS)
-					or die "unlock $Global::RunDir/jobs: $!\n";
+					or die "unlock $Global::RunDir/jobsqueue: $!\n";
 				close(Vend::Server::JOBS)
-					or die "close $Global::RunDir/jobs: $!\n";
+					or die "close $Global::RunDir/jobsqueue: $!\n";
 			} else {
 				unlockfile(\*Vend::Server::JOBS)
-					or die "unlock $Global::RunDir/jobs: $!\n";
+					or die "unlock $Global::RunDir/jobsqueue: $!\n";
 				close(Vend::Server::JOBS)
-					or die "close $Global::RunDir/jobs: $!\n";
-				unlink "$Global::RunDir/jobs"
-					or die "unlink $Global::RunDir/jobs: $!\n";
+					or die "close $Global::RunDir/jobsqueue: $!\n";
+				unlink "$Global::RunDir/jobsqueue"
+					or die "unlink $Global::RunDir/jobsqueue: $!\n";
 			}
 
 			# now we run the scheduled jobs