changed lockfile name to .lck (from .lock) for M$

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 291a751d0d166b24cd6c54f4f38fc8593bbb82b2..8a02bfd376adf9110afd20a77363c0f740af1083 100755 (executable)
--- 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;
@@ -86,11 +89,8 @@ use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
 $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
-$is_win = $^O =~ /^MS/ || $^O =~ /^OS-2/; # is it Windows?
-
 
       
 # send a message to call on conn and disconnect
@@ -303,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 
@@ -370,7 +376,7 @@ 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"));