X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=4965a49fd3ebb0c8e8a0b798093a2aec36bcc052;hb=d384410d4d5d1031cabab44350b80f2a55fe808d;hp=58742e1952bd78b3e8618c8d51451c8c083a7f3f;hpb=28788cb9ae3fb39965886dbee36eec9266b1d904;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 58742e19..4965a49f 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 = <CLLOCK>;
@@ -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;
 
@@ -244,7 +245,7 @@ sub rec
 sub clean_inqueue
 {
 	my $dxchan = shift;
-	@inqueue = grep {$_ != $dxchan} @inqueue;
+	@inqueue = grep {$_->{dxchan} != $dxchan} @inqueue;
 }
 
 sub login
@@ -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();
 };