X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=6ac7a3fb907265f6bb92dbedd29d599d9d2c1662;hb=a6e52cc1680c2c30ef874e2e6c16d00c956624ee;hp=4816916c37c85a79f75ce21b582ad36ac567ffa6;hpb=01f2793abb2aa2bef7762183a33f5e867ab703ee;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 4816916c..6ac7a3fb 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -25,7 +25,7 @@ BEGIN {
 
 	# try to create and lock a lockfile (this isn't atomic but 
 	# should do for now
-	my $lockfn = "$root/perl/cluster.lock";       # lock file name
+	$lockfn = "$root/perl/cluster.lck";       # lock file name
 	if (-e $lockfn) {
 		open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 		my $pid = <CLLOCK>;
@@ -36,6 +36,9 @@ BEGIN {
 	open(CLLOCK, ">$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 	print CLLOCK "$$\n";
 	close CLLOCK;
+
+	$is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
+	$systime = time;
 }
 
 use Msg;
@@ -79,14 +82,13 @@ package main;
 use strict;
 use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects 
 			$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr 
-			$clusterport $mycall $decease $build
+			$clusterport $mycall $decease $build $is_win
 		   );
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
 $version = "1.47";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
-$lockfn = "cluster.lock";       # lock file name
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();				# list of listeners
 
@@ -98,7 +100,7 @@ sub already_conn
 	
 	dbg('chan', "-> D $call $mess\n"); 
 	$conn->send_now("D$call|$mess");
-	Msg->sleep(2);
+	sleep(2);
 	$conn->disconnect;
 }
 
@@ -301,6 +303,12 @@ sub uptime
 	my $mins = int $t / 60;
 	return sprintf "%d %02d:%02d", $days, $hours, $mins;
 }
+
+sub AGWrestart
+{
+	AGWMsg::init(\&new_channel);
+}
+
 #############################################################
 #
 # The start of the main line of code 
@@ -368,13 +376,13 @@ for (@main::listen) {
 	push @listeners, $conn;
 	dbg('err', "External Port: $_->[0] $_->[1]");
 }
-AGWMsg::init(\&new_channel);
+AGWrestart();
 
 # load bad words
 dbg('err', "load badwords: " . (BadWords::load or "Ok"));
 
 # prime some signals
-unless ($^O =~ /^MS/) {
+unless ($is_win) {
 	unless ($DB::VERSION) {
 		$SIG{INT} = \&cease;
 		$SIG{TERM} = \&cease;