projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix typo
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 80c4a0573cb62899fa408826b0f46e7563677af1..8aade278e42ebe2bb38d1297b21cf6e85491a260 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-68,7
+68,6
@@
use DXCommandmode;
use DXProtVars;
use DXProtout;
use DXProt;
use DXProtVars;
use DXProtout;
use DXProt;
-use Aranea;
use DXMsg;
use DXCron;
use DXConnect;
use DXMsg;
use DXCron;
use DXConnect;
@@
-99,9
+98,10
@@
use Mrtg;
use USDB;
use UDPMsg;
use QSL;
use USDB;
use UDPMsg;
use QSL;
-use Thingy;
use RouteDB;
use RouteDB;
-use AMsg;
+use DXXml;
+use DXSql;
+use IsoTime;
use Data::Dumper;
use IO::File;
use Data::Dumper;
use IO::File;
@@
-116,7
+116,7
@@
use strict;
use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
$clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
$clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
- $allowdxby $dbh $dsn $dbuser $dbpass
+ $allowdxby $dbh $dsn $dbuser $dbpass
$do_xml
);
@inqueue = (); # the main input queue, an array of hashes
);
@inqueue = (); # the main input queue, an array of hashes
@@
-135,7
+135,7
@@
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
$main::build += $VERSION;
$main::branch += $BRANCH;
$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
$main::build += $VERSION;
$main::branch += $BRANCH;
-$main::build
+= 1
; # fudge (put back for now)
+$main::build
-= 3
; # fudge (put back for now)
@@
-349,24
+349,21
@@
STDOUT->autoflush(1);
$build += $main::version;
$build = "$build.$branch" if $branch;
$build += $main::version;
$build = "$build.$branch" if $branch;
-LogDbg('cluster', "DXSpider V$version, build $build started");
+# try to load the database
+if (DXSql::init($dsn)) {
+ $dbh = DXSql->new($dsn);
+ $dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
+}
+
+# try to load XML::Simple
+DXXml::init();
# banner
my ($year) = (gmtime)[5];
$year += 1900;
# banner
my ($year) = (gmtime)[5];
$year += 1900;
+LogDbg('cluster', "DXSpider V$version, build $build started");
dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
-# try to load the database
-if ($dsn && -e "$root/perl/DXSql.pm") {
- require DXSql;
- import DXSql;
-
- if (DXSql::init()) {
- $dbh = DXSql->new($dsn);
- $dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
- }
-}
-
# load Prefixes
dbg("loading prefixes ...");
dbg(USDB::init());
# load Prefixes
dbg("loading prefixes ...");
dbg(USDB::init());
@@
-463,7
+460,6
@@
Spot->init();
# initialise the protocol engine
dbg("Start Protocol Engines ...");
DXProt->init();
# initialise the protocol engine
dbg("Start Protocol Engines ...");
DXProt->init();
-Aranea->init();
# 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));
# 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));
@@
-514,12
+510,12
@@
for (;;) {
# do timed stuff, ongoing processing happens one a second
if ($timenow != $systime) {
# do timed stuff, ongoing processing happens one a second
if ($timenow != $systime) {
- reap if $zombies;
-
$systime = $timenow
;
+ reap
()
if $zombies;
+
IsoTime::update($systime = $timenow)
;
DXCron::process(); # do cron jobs
DXCommandmode::process(); # process ongoing command mode stuff
DXCron::process(); # do cron jobs
DXCommandmode::process(); # process ongoing command mode stuff
+ DXXml::process();
DXProt::process(); # process ongoing ak1a pcxx stuff
DXProt::process(); # process ongoing ak1a pcxx stuff
- Aranea::process();
DXConnect::process();
DXMsg::process();
DXDb::process();
DXConnect::process();
DXMsg::process();
DXDb::process();