move usdb init as per k1xx's bug

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 4965a49fd3ebb0c8e8a0b798093a2aec36bcc052..68f40e1aa83eff76c8b11aad87c49cb7a00718be 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -99,6 +99,7 @@ use Mrtg;
 use USDB;
 use UDPMsg;
 use QSL;
+use Thingy;
 
 use Data::Dumper;
 use IO::File;
@@ -126,7 +127,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 += 5;                             # add an offset to make it bigger than last system
+$main::build += 4;                             # add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -336,7 +337,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;
@@ -407,9 +408,9 @@ dbg("DXSpider Version $version, build $build started");
 
 # load Prefixes
 dbg("loading prefixes ...");
+dbg(USDB::init());
 my $r = Prefix::init();
 confess $r if $r;
-dbg(USDB::init());
 
 # load band data
 dbg("loading band data ...");
@@ -558,7 +559,10 @@ for (;;) {
                DXUser::process();
                DXDupe::process();
                AGWMsg::process();
-                               
+
+               # this where things really start to happen (in DXSpider 2)
+               Thingy::process();
+               
                eval { 
                        Local::process();       # do any localised processing
                };