X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=003ae845becc11c9f73a8292333bfb91e17748c0;hb=dc305f992d75a6b35edda9e1aefab510a3ed617e;hp=2510c940cd5bfdc107ce2d5dac415628a1887fe3;hpb=8b084abf6e46e762cc53bc58c19fd03e19f9c405;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index 2510c940..003ae845 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -102,6 +102,7 @@ use QSL; use Thingy; use RouteDB; use AMsg; +use DXXml; use Data::Dumper; use IO::File; @@ -133,9 +134,10 @@ $allowdxby = 0; # 1 = allow "dx by ", 0 - don't allow it 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 += 1; # add an offset to make it bigger than last system $main::build += $VERSION; $main::branch += $BRANCH; +$main::build += 1; # fudge (put back for now) + # send a message to call on conn and disconnect @@ -181,8 +183,7 @@ sub new_channel 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)); @@ -198,7 +199,7 @@ sub new_channel if ($baseuser && $baseuser->lockout || $lock) { if (!$user || !defined $lock || $lock) { my $host = $conn->{peerhost} || "unknown"; - Log('DXCommand', "$call on $host is locked out, disconnected"); + LogDbg('DXCommand', "$call on $host is locked out, disconnected"); $conn->disconnect; return; } @@ -283,8 +284,7 @@ sub cease $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(); @@ -335,6 +335,10 @@ sub AGWrestart $starttime = $systime = time; $lang = 'en' unless $lang; +unless ($DB::VERSION) { + $SIG{INT} = $SIG{TERM} = \&cease; +} + # open the debug file, set various FHs to be unbuffered dbginit(\&DXCommandmode::broadcast_debug); foreach (@debug) { @@ -346,24 +350,26 @@ STDOUT->autoflush(1); $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; import DXSql; if (DXSql::init()) { - $dbh = DXSql->new($dsn, $dbuser, $dbpass); + $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; +LogDbg('cluster', "DXSpider V$version, build $build started"); +dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH"); + # load Prefixes dbg("loading prefixes ..."); dbg(USDB::init());