projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clean up various things and add the DXXml.pm module
[spider.git]
/
perl
/
cluster.pl
diff --git
a/perl/cluster.pl
b/perl/cluster.pl
index 8645dbd9dd2e81ad467429124f4cc0c0c9f9fc8d..003ae845becc11c9f73a8292333bfb91e17748c0 100755
(executable)
--- a/
perl/cluster.pl
+++ b/
perl/cluster.pl
@@
-102,6
+102,7
@@
use QSL;
use Thingy;
use RouteDB;
use AMsg;
use Thingy;
use RouteDB;
use AMsg;
+use DXXml;
use Data::Dumper;
use IO::File;
use Data::Dumper;
use IO::File;
@@
-135,6
+136,8
@@
$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)
+
# send a message to call on conn and disconnect
# send a message to call on conn and disconnect
@@
-180,8
+183,7
@@
sub new_channel
if ($bumpexisting) {
my $ip = $conn->{peerhost} || 'unknown';
$dxchan->send_now('D', DXM::msg($lang, 'conbump', $call, $ip));
if ($bumpexisting) {
my $ip = $conn->{peerhost} || 'unknown';
$dxchan->send_now('D', DXM::msg($lang, 'conbump', $call, $ip));
- Log('DXCommand', "$call bumped off by $ip, disconnected");
- dbg("$call bumped off by $ip, disconnected");
+ LogDbg('DXCommand', "$call bumped off by $ip, disconnected");
$dxchan->disconnect;
} else {
already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
$dxchan->disconnect;
} else {
already_conn($conn, $call, DXM::msg($lang, 'conother', $call, $main::mycall));
@@
-197,7
+199,7
@@
sub new_channel
if ($baseuser && $baseuser->lockout || $lock) {
if (!$user || !defined $lock || $lock) {
my $host = $conn->{peerhost} || "unknown";
if ($baseuser && $baseuser->lockout || $lock) {
if (!$user || !defined $lock || $lock) {
my $host = $conn->{peerhost} || "unknown";
- Log('DXCommand', "$call on $host is locked out, disconnected");
+ Log
Dbg
('DXCommand', "$call on $host is locked out, disconnected");
$conn->disconnect;
return;
}
$conn->disconnect;
return;
}
@@
-282,8
+284,7
@@
sub cease
$l->close_server;
}
$l->close_server;
}
- dbg("DXSpider version $version, build $build ended") if isdbg('chan');
- Log('cluster', "DXSpider V$version, build $build ended");
+ LogDbg('cluster', "DXSpider V$version, build $build ended");
dbgclose();
Logclose();
dbgclose();
Logclose();
@@
-349,14
+350,6
@@
STDOUT->autoflush(1);
$build += $main::version;
$build = "$build.$branch" if $branch;
$build += $main::version;
$build = "$build.$branch" if $branch;
-Log('cluster', "DXSpider V$version, build $build started");
-
-# banner
-my ($year) = (gmtime)[5];
-$year += 1900;
-dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
-dbg("DXSpider Version $version, build $build started");
-
# try to load the database
if ($dsn && -e "$root/perl/DXSql.pm") {
require DXSql;
# try to load the database
if ($dsn && -e "$root/perl/DXSql.pm") {
require DXSql;
@@
-368,6
+361,15
@@
if ($dsn && -e "$root/perl/DXSql.pm") {
}
}
}
}
+# try to load XML::Simple
+DXXml::init();
+
+# banner
+my ($year) = (gmtime)[5];
+$year += 1900;
+LogDbg('cluster', "DXSpider V$version, build $build started");
+dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
+
# load Prefixes
dbg("loading prefixes ...");
dbg(USDB::init());
# load Prefixes
dbg("loading prefixes ...");
dbg(USDB::init());