X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=6d4dc90f66b2fc523a8d735069f231642d253341;hb=2ffd50e69be8f5e17e8ac3f8735139af7316195a;hp=0e321f2326efadff00b9ba70a19ee939037ffe85;hpb=2145c6711ead2e9bc0e599044343c5c9064c3ddc;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index 0e321f23..6d4dc90f 100755 --- 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 = ; @@ -98,6 +98,7 @@ use Editable; use Mrtg; use USDB; use UDPMsg; +use QSL; use Data::Dumper; use IO::File; @@ -125,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 += 6; # 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; @@ -335,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; @@ -406,7 +407,7 @@ dbg("DXSpider Version $version, build $build started"); # load Prefixes dbg("loading prefixes ..."); -my $r = Prefix::load(); +my $r = Prefix::init(); confess $r if $r; dbg(USDB::init()); @@ -522,6 +523,7 @@ DXDb::load(); # starting local stuff dbg("doing local initialisation ..."); +QSL::init(1); eval { Local::init(); };