set/page 0 switches off paging

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 20e80ddbfe16f61978b8f5731431a94c2e19375f..98fdbb187491697c32bccbb5e030bcbf645d489c 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -69,6 +69,7 @@ use DXDb;
 use DXHash;
 use DXDupe;
 use Prefix;
+use Spot;
 use Bands;
 use Keps;
 use Minimuf;
@@ -99,7 +100,7 @@ use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
 
 @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
+$version = "1.48";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();                               # list of listeners
@@ -146,7 +147,7 @@ sub new_channel
                        ;
                } else {
                        if (my $ref = DXCluster->get_exact($call)) {
-                               my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
+                               my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->dxchancall);
                                already_conn($conn, $call, $mess);
                                return;
                        }
@@ -154,7 +155,7 @@ sub new_channel
                $user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
        } else {
                if (my $ref = DXCluster->get_exact($call)) {
-                       my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
+                       my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->dxchancall);
                        already_conn($conn, $call, $mess);
                        return;
                }
@@ -206,8 +207,10 @@ sub cease
 {
        my $dxchan;
 
-       $SIG{'TERM'} = 'IGNORE';
-       $SIG{'INT'} = 'IGNORE';
+       unless ($is_win) {
+               $SIG{'TERM'} = 'IGNORE';
+               $SIG{'INT'} = 'IGNORE';
+       }
        
        DXUser::sync;
 
@@ -217,28 +220,21 @@ sub cease
        dbg('local', "Local::finish error $@") if $@;
 
        # disconnect nodes
-       foreach $dxchan (DXChannel->get_all()) {
-               next unless $dxchan->is_node;
-           $dxchan->disconnect unless $dxchan == $DXProt::me;
+       foreach $dxchan (DXChannel->get_all_nodes) {
+           $dxchan->disconnect(2) unless $dxchan == $DXProt::me;
        }
-       Msg->event_loop(1, 0.05);
-       Msg->event_loop(1, 0.05);
+       Msg->event_loop(100, 0.01);
 
        # disconnect users
-       foreach $dxchan (DXChannel->get_all()) {
-               next if $dxchan->is_node;
-               $dxchan->disconnect(2) unless $dxchan == $DXProt::me;
+       foreach $dxchan (DXChannel->get_all_users) {
+               $dxchan->disconnect;
        }
 
        # disconnect AGW
        AGWMsg::finish();
-       
-       Msg->event_loop(1, 0.05);
-       Msg->event_loop(1, 0.05);
-       Msg->event_loop(1, 0.05);
-       Msg->event_loop(1, 0.05);
-       Msg->event_loop(1, 0.05);
-       Msg->event_loop(1, 0.05);
+
+       # end everything else
+       Msg->event_loop(100, 0.01);
        DXUser::finish();
        DXDupe::finish();
 
@@ -393,11 +389,11 @@ AGWrestart();
 dbg('err', "load badwords: " . (BadWords::load or "Ok"));
 
 # prime some signals
+unless ($DB::VERSION) {
+       $SIG{INT} = $SIG{TERM} = sub { $decease = 1 };
+}
+
 unless ($is_win) {
-       unless ($DB::VERSION) {
-               $SIG{INT} = \&cease;
-               $SIG{TERM} = \&cease;
-       }
        $SIG{HUP} = 'IGNORE';
        $SIG{CHLD} = sub { $zombies++ };