$no = 'No'; # ditto for no
$user_interval = 11*60; # the interval between unsolicited prompts if no traffic
-
# make sure that modules are searched in the order local then perl
BEGIN {
umask 002;
eval {
require local::lib;
};
- import local::lib unless ($@);
+ unless ($@) {
+# import local::lib;
+ import local::lib qw(/spider/perl5lib);
+ }
# root of directory tree for this system
$root = "/spider";
$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
+ unshift @INC, "$root/perl5lib" unless grep {$_ eq "$root/perl5lib"} @INC;
unshift @INC, "$root/perl"; # this IS the right way round!
unshift @INC, "$root/local";
}
+
use DXVars;
use SysVar;
use BBS;
use WCY;
use BadWords;
-use Timer;
+use DXTimer;
use Route;
use Route::Node;
use Route::User;
$user->long($main::mylongitude);
$user->qra($main::mylocator);
}
- $user->startt($main::systime);
+ $user->startt($main::systime);
$conn->conns($call);
$dxchan = Web->new($call, $conn, $user);
$dxchan->enhanced(1);
}
# is he locked out ?
+ my $lock;
$user = DXUser::get_current($call);
+ $conn->conns($call);
my $basecall = $call;
- $basecall =~ s/-\d+$//; # remember this for later multiple user processing
- my $lock;
+ $basecall =~ s/-\d+$//; # remember this for later multiple user processing, it's used for other stuff than checking lockout status
if ($user) {
# make sure we act on any locked status that the actual incoming call has.
$lock = $user->lockout;
- } elsif ($allowmultiple && $call ne $basecall) {
- # if we are allowing multiple connections and there is a basecall minus incoming ssid, use the basecall's lock status
- $user = DXUser::get_current($basecall);
- $lock = $user->lockout if $user;
+ } elsif ($basecall ne $call) {
+ # if there isn't a SSID on the $call, then try the base
+ my $luser = DXUser::get_current($basecall);
+ $lock = $luser->lockout if $luser;
}
# now deal with the lock
UDPMsg::finish();
# end everything else
+ RBN::finish();
DXUser::finish();
DXDupe::finish();
$l->close_server;
}
- LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) ended");
+ LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O ended");
dbg("bye bye everyone - bye bye");
dbgclose();
Logclose();
#
#############################################################
+ chdir $root;
+
$starttime = $systime = time;
$systime_days = int ($systime / 86400);
$systime_daystart = $systime_days * 86400;
}
# open the debug file, set various FHs to be unbuffered
- dbginit($broadcast_debug ? \&DXCommandmode::broadcast_debug : undef);
+ dbginit(undef, $broadcast_debug ? \&DXCommandmode::broadcast_debug : undef);
foreach (@debug) {
dbgadd($_);
}
STDOUT->autoflush(1);
+ # log our path
+ dbg "Perl path: " . join(':', @INC);
# try to load the database
if (DXSql::init($dsn)) {
import Encode;
$can_encode = 1;
}
+
$gitbranch = 'none';
$gitversion = 'none';
- eval { require Git; };
- unless ($@) {
- import Git;
- # determine the real version number
- my $repo = Git->repository(Directory => "$root/.git");
- if ($repo) {
- my $desc = $repo->command_oneline(['describe', '--long'], STDERR => 0);
- if ($desc) {
- my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
- $s ||= '';
- dbg("Git: $desc") if isdbg('git');
- dbg("Git: V=$v S=$s B=$b g=$g") if isdbg('git');
- $version = $v;
- $build = $b || 0;
- $gitversion = "$g\[r]";
- }
- my @branch = $repo->command([qw{branch}], STDERR=>0);
+ # determine the real Git build number and branch
+ my $desc;
+ eval {$desc = `git --git-dir=$root/.git describe --long`};
+ if (!$@ && $desc) {
+ my ($v, $s, $b, $g) = $desc =~ /^([\d\.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
+ $version = $v;
+ my $subversion = $s || 0; # not used elsewhere
+ $build = $b || 0;
+ $gitversion = "$g\[r]";
+ }
+ if (!$@) {
+ my @branch;
+
+ eval {@branch = `git --git-dir=$root/.git branch`};
+ unless ($@) {
for (@branch) {
my ($star, $b) = split /\s+/;
if ($star eq '*') {
}
}
}
+
$SIG{__DIE__} = $w;
}
+ # setup location of motd & issue
+ localdata_mv($motd);
+ $motd = localdata($motd);
+ localdata_mv("issue");
+
+
# try to load XML::Simple
DXXml::init();
# banner
my ($year) = (gmtime)[5];
$year += 1900;
- LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) started");
+ LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O started");
dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
# load Prefixes
dbg("loading user file system ...");
DXUser::init(4); # version 4 == json format
+ Filter::init(); # doesn't do much, but has to be done
+
+
# look for the sysop and the alias user and complain if they aren't there
{
die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';). Oh and don't forget to rerun create_sysop.pl!" if $mycall eq $myalias;
dbg("Start WCY");
WCY->init();
- # initial the Spot stuff
- dbg("Starting DX Spot system");
- Spot->init();
-
# initialise the protocol engine
dbg("Start Protocol Engines ...");
DXProt->init();
+ # read startup script
+ my $script = new Script "startup";
+ $script->run($main::me) if $script;
+
# put in a DXCluster node for us here so we can add users and take them away
$routeroot = Route::Node->new($mycall, $version*100+5300, Route::here($main::me->here)|Route::conf($main::me->conf));
$routeroot->do_pc9x(1);
# $Route::filterdef->cmd($main::me, 'route', 'accept', "node_default call $mycall" );
#}
+ # initial the Spot stuff
+ dbg("Starting DX Spot system");
+ Spot->init();
+
# read in any existing message headers and clean out old crap
dbg("reading existing message headers ...");
DXMsg->init();
dbg("reading database descriptors ...");
DXDb::load();
+ dbg("starting RBN ...");
+ RBN::init();
+
# starting local stuff
dbg("doing local initialisation ...");
QSL::init(1);
# this, such as it is, is the main loop!
dbg("orft we jolly well go ...");
- my $script = new Script "startup";
- $script->run($main::me) if $script;
#open(DB::OUT, "|tee /tmp/aa");
}
$main::me->disconnect;
}
- Mojo::IOLoop->stop if --$ending <= 0;
+ Mojo::IOLoop->stop_gracefully if --$ending <= 0;
}
}
IsoTime::update($systime);
DXCommandmode::process(); # process ongoing command mode stuff
DXProt::process(); # process ongoing ak1a pcxx stuff
- DXCron::process(); # do cron jobs
DXXml::process();
DXConnect::process();
DXMsg::process();
DXDb::process();
DXUser::process();
DXDupe::process();
- DXCron::process(); # do cron jobs
IsoTime::update($systime);
DXConnect::process();
DXUser::process();
AGWMsg::process();
-
- Timer::handler();
+ DXCron::process(); # do cron jobs
+ RBN::process();
+
+ DXTimer::handler();
DXLog::flushall();
}
}
-
sub per_minute
{
-
+ RBN::per_minute();
}
sub per_10_minute
{
-
+ RBN::per_10_minute();
}
sub per_hour
{
-
+ RBN::per_hour();
}
sub per_day