fixed merge command

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index b471c754ec82a7999c39b8c50b69e0287ad05292..51e8aed7b386cd9ced159f7ac8d1408e9bb6c019 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -61,13 +61,13 @@ use Filter;
 use Local;
 use Fcntl ':flock'; 
 
-use Carp;
+use Carp qw(cluck);
 
 package main;
 
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
-$version = "1.28";                             # the version no of the software
+$version = "1.31";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
       
@@ -174,8 +174,22 @@ sub cease
                Local::finish();   # end local processing
        };
        dbg('local', "Local::finish error $@") if $@;
-       
+
+       # disconnect users
+       foreach $dxchan (DXChannel->get_all()) {
+               next if $dxchan->is_ak1a;
+               disconnect($dxchan) unless $dxchan == $DXProt::me;
+       }
+       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);
+
+       # disconnect nodes
        foreach $dxchan (DXChannel->get_all()) {
+               next unless $dxchan->is_ak1a;
                disconnect($dxchan) unless $dxchan == $DXProt::me;
        }
        Msg->event_loop(1, 0.05);
@@ -194,7 +208,9 @@ sub cease
        dbg('chan', "DXSpider version $version ended");
        Log('cluster', "DXSpider V$version stopped");
        dbgclose();
+       Logclose();
        unlink $lockfn;
+#      $SIG{__WARN__} = $SIG{__DIE__} =  sub {my $a = shift; cluck($a); };
        exit(0);
 }
 
@@ -214,7 +230,7 @@ sub process_inqueue
        
        my $data = $self->{data};
        my $dxchan = $self->{dxchan};
-       my ($sort, $call, $line) = $data =~ /^(\w)(\S+)\|(.*)$/;
+       my ($sort, $call, $line) = $data =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
 
        # the above regexp must work
        return unless ($sort && $call && $line);
@@ -268,6 +284,7 @@ sub uptime
 $starttime = $systime = time;
 
 # open the debug file, set various FHs to be unbuffered
+dbginit();
 foreach (@debug) {
        dbgadd($_);
 }
@@ -357,6 +374,7 @@ for (;;) {
                DXCommandmode::process(); # process ongoing command mode stuff
                DXProt::process();              # process ongoing ak1a pcxx stuff
                DXConnect::process();
+               DXMsg::process();
                eval { 
                        Local::process();       # do any localised processing
                };