# 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>;
use Mrtg;
use USDB;
use UDPMsg;
+use QSL;
use Data::Dumper;
use IO::File;
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;
sub clean_inqueue
{
my $dxchan = shift;
- @inqueue = grep {$_ != $dxchan} @inqueue;
+ @inqueue = grep {$_->{dxchan} != $dxchan} @inqueue;
}
sub login
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;
# load Prefixes
dbg("loading prefixes ...");
-my $r = Prefix::load();
+my $r = Prefix::init();
confess $r if $r;
dbg(USDB::init());
# starting local stuff
dbg("doing local initialisation ...");
+QSL::init(1);
eval {
Local::init();
};