more developed version

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 7a93e685955ef616aacb1ca76052b3a538ba61ef..6d4dc90f66b2fc523a8d735069f231642d253341 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -33,7 +33,7 @@ BEGIN {
 
        # try to create and lock a lockfile (this isn't atomic but 
        # should do for now
-       $lockfn = "$root/perl/cluster.lck";       # lock file name
+       $lockfn = "$root/local/cluster.lck";       # lock file name
        if (-e $lockfn) {
                open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
                my $pid = <CLLOCK>;
@@ -96,6 +96,9 @@ use Route::Node;
 use Route::User;
 use Editable;
 use Mrtg;
+use USDB;
+use UDPMsg;
+use QSL;
 
 use Data::Dumper;
 use IO::File;
@@ -114,7 +117,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.50";                             # the version no of the software
+$version = "1.51";                             # the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();                               # list of listeners
@@ -123,7 +126,7 @@ $reqreg = 0;                                        # 1 = registration required, 2 = deregister people
 use vars qw($VERSION $BRANCH $build $branch);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
 $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += 10;                            # add an offset to make it bigger than last system
+$main::build += 5;                             # add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -238,6 +241,13 @@ sub rec
        }
 }
 
+# remove any outstanding entries on the inqueue after a disconnection (usually)
+sub clean_inqueue
+{
+       my $dxchan = shift;
+       @inqueue = grep {$_->{dxchan} != $dxchan} @inqueue;
+}
+
 sub login
 {
        return \&new_channel;
@@ -274,6 +284,9 @@ sub cease
        # disconnect AGW
        AGWMsg::finish();
 
+       # disconnect UDP customers
+       UDPMsg::finish();
+
        # end everything else
        Msg->event_loop(100, 0.01);
        DXUser::finish();
@@ -323,7 +336,7 @@ sub process_inqueue
                return unless defined $sort;
        
                # do the really sexy console interface bit! (Who is going to do the TK interface then?)
-               dbg("<- $sort $call $line\n") if $sort ne 'D' && isdbg('chan');
+               dbg("<- $sort $call $line") if $sort ne 'D' && isdbg('chan');
                if ($self->{disconnecting}) {
                        dbg('In disconnection, ignored');
                        next;
@@ -394,7 +407,9 @@ dbg("DXSpider Version $version, build $build started");
 
 # load Prefixes
 dbg("loading prefixes ...");
-Prefix::load();
+my $r = Prefix::init();
+confess $r if $r;
+dbg(USDB::init());
 
 # load band data
 dbg("loading band data ...");
@@ -424,8 +439,13 @@ foreach my $l (@main::listen) {
        push @listeners, $conn;
        dbg("External Port: $l->[0] $l->[1]");
 }
+
+dbg("AGW Listener") if $AGWMsg::enable;
 AGWrestart();
 
+dbg("UDP Listener") if $UDPMsg::enable;
+UDPMsg::init(\&new_channel);
+
 # load bad words
 dbg("load badwords: " . (BadWords::load or "Ok"));
 
@@ -453,23 +473,29 @@ unless ($is_win) {
 }
 
 # start dupe system
+dbg("Starting Dupe system");
 DXDupe::init();
 
 # read in system messages
+dbg("Read in Messages");
 DXM->init();
 
 # read in command aliases
+dbg("Read in Aliases");
 CmdAlias->init();
 
 # initialise the Geomagnetic data engine
+dbg("Start WWV");
 Geomag->init();
+dbg("Start WCY");
 WCY->init();
 
 # initial the Spot stuff
+dbg("Starting DX Spot system");
 Spot->init();
 
 # initialise the protocol engine
-dbg("reading in duplicate spot and WWV info ...");
+dbg("Start Protocol Engines ...");
 DXProt->init();
 QXProt->init();
 
@@ -497,6 +523,7 @@ DXDb::load();
 
 # starting local stuff
 dbg("doing local initialisation ...");
+QSL::init(1);
 eval {
        Local::init();
 };