altered pc21 logic

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index b3b4c5a64595547862a84b244d7d0ab14850b0eb..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,11 +36,15 @@ 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;
 use IntMsg;
 use ExtMsg;
+use AGWMsg;
 use DXVars;
 use DXDebug;
 use DXLog;
@@ -78,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
 
@@ -97,7 +100,7 @@ sub already_conn
        
        dbg('chan', "-> D $call $mess\n"); 
        $conn->send_now("D$call|$mess");
-       sleep(2);
+       Msg->sleep(2);
        $conn->disconnect;
 }
 
@@ -214,6 +217,10 @@ sub cease
                next if $dxchan->is_node;
                $dxchan->disconnect unless $dxchan == $DXProt::me;
        }
+
+       # disconnect AGW
+       AGWMsg::finish();
+       
        Msg->event_loop(1, 0.05);
        Msg->event_loop(1, 0.05);
        Msg->event_loop(1, 0.05);
@@ -296,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 
@@ -363,12 +376,13 @@ for (@main::listen) {
        push @listeners, $conn;
        dbg('err', "External Port: $_->[0] $_->[1]");
 }
+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;
@@ -461,7 +475,8 @@ for (;;) {
                DXDb::process();
                DXUser::process();
                DXDupe::process();
-               
+               AGWMsg::process();
+                               
                eval { 
                        Local::process();       # do any localised processing
                };