improve sh/log sh/rcmd etc

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 6893b7087b77a14353204c6def891390a76f2950..0b4e7428fcee2c421d12b348962373e7ba506900 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -95,6 +95,8 @@ use Route;
 use Route::Node;
 use Route::User;
 use Editable;
+use Mrtg;
+use USDB;
 
 use Data::Dumper;
 use IO::File;
@@ -113,7 +115,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
@@ -121,8 +123,8 @@ $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;
-$main::build += 11;                            # add an offset to make it bigger than last system
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
+$main::build += 7;                             # add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -393,7 +395,9 @@ dbg("DXSpider Version $version, build $build started");
 
 # load Prefixes
 dbg("loading prefixes ...");
-Prefix::load();
+my $r = Prefix::load();
+confess $r if $r;
+dbg(USDB::init());
 
 # load band data
 dbg("loading band data ...");
@@ -452,23 +456,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();