X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=d3c905340ee7cf7d2875712c0bd467695b9739ec;hb=a386178f3c1bfcd3d0975d94448245b8c4203988;hp=2510c940cd5bfdc107ce2d5dac415628a1887fe3;hpb=8b084abf6e46e762cc53bc58c19fd03e19f9c405;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index 2510c940..d3c90534 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -7,19 +7,19 @@ # # Copyright (c) 1998 Dirk Koopman G1TLH # -# $Id$ -# +# +# require 5.004; # make sure that modules are searched in the order local then perl BEGIN { umask 002; - + # root of directory tree for this system - $root = "/spider"; + $root = "/spider"; $root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'}; - + unshift @INC, "$root/perl"; # this IS the right way round! unshift @INC, "$root/local"; @@ -27,11 +27,11 @@ BEGIN { die "The directory $root doesn't exist, please RTFM" unless -d $root; die "$root/local doesn't exist, please RTFM" unless -d "$root/local"; die "$root/local/DXVars.pm doesn't exist, please RTFM" unless -e "$root/local/DXVars.pm"; - + mkdir "$root/local_cmd", 0777 unless -d "$root/local_cmd"; - - # try to create and lock a lockfile (this isn't atomic but + + # try to create and lock a lockfile (this isn't atomic but # should do for now $lockfn = "$root/local/cluster.lck"; # lock file name if (-e $lockfn) { @@ -68,7 +68,6 @@ use DXCommandmode; use DXProtVars; use DXProtout; use DXProt; -use Aranea; use DXMsg; use DXCron; use DXConnect; @@ -99,52 +98,46 @@ use Mrtg; use USDB; use UDPMsg; use QSL; -use Thingy; use RouteDB; -use AMsg; +use DXXml; +use DXSql; +use IsoTime; use Data::Dumper; use IO::File; -use Fcntl ':flock'; +use Fcntl ':flock'; use POSIX ":sys_wait_h"; +use Version; use Local; package main; use strict; -use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects - $zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr +use vars qw(@inqueue $systime $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 $systime_days $systime_daystart + $can_encode ); @inqueue = (); # the main input queue, an array of hashes $systime = 0; # the time now (in seconds) -$version = "1.52"; # the version no of the software -$starttime = 0; # the starting time of the cluster -#@outstanding_connects = (); # list of outstanding connects +$starttime = 0; # the starting time of the cluster +@outstanding_connects = (); # list of outstanding connects @listeners = (); # list of listeners $reqreg = 0; # 1 = registration required, 2 = deregister people $bumpexisting = 1; # 1 = allow new connection to disconnect old, 0 - don't allow it $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; - - # send a message to call on conn and disconnect sub already_conn { my ($conn, $call, $mess) = @_; $conn->disable_read(1); - dbg("-> D $call $mess\n") if isdbg('chan'); + dbg("-> D $call $mess\n") if isdbg('chan'); $conn->send_now("D$call|$mess"); sleep(2); $conn->disconnect; @@ -170,7 +163,7 @@ sub new_channel } # set up the basic channel info - # is there one already connected to me - locally? + # is there one already connected to me - locally? my $user = DXUser->get_current($call); my $dxchan = DXChannel::get($call); if ($dxchan) { @@ -181,8 +174,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,18 +190,18 @@ 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; } } - + if ($user) { $user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems } else { $user = DXUser->new($call); } - + # create the channel if ($user->is_node) { $dxchan = DXProt->new($call, $conn, $user); @@ -245,7 +237,7 @@ sub cease $SIG{'TERM'} = 'IGNORE'; $SIG{'INT'} = 'IGNORE'; } - + DXUser::sync; eval { @@ -283,13 +275,12 @@ 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 $subversion.$build ended"); dbgclose(); Logclose(); $dbh->finish if $dbh; - + unlink $lockfn; # $SIG{__WARN__} = $SIG{__DIE__} = sub {my $a = shift; cluck($a); }; exit(0); @@ -328,13 +319,19 @@ sub AGWrestart ############################################################# # -# The start of the main line of code +# The start of the main line of code # ############################################################# $starttime = $systime = time; +$systime_days = int ($systime / 86400); +$systime_daystart = $systime_days * 86400; $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) { @@ -342,27 +339,33 @@ foreach (@debug) { } STDOUT->autoflush(1); -# calculate build number -$build += $main::version; -$build = "$build.$branch" if $branch; +# try to load the database +if (DXSql::init($dsn)) { + $dbh = DXSql->new($dsn); + $dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh; +} + +# try to load Encode +{ + local $^W = 0; + my $w = $SIG{__DIE__}; + $SIG{__DIE__} = 'IGNORE'; + eval { require Encode; }; + unless ($@) { + import Encode; + $can_encode = 1; + } + $SIG{__DIE__} = $w; +} -Log('cluster', "DXSpider V$version, build $build started"); +# try to load XML::Simple +DXXml::init(); # banner my ($year) = (gmtime)[5]; $year += 1900; +LogDbg('cluster', "DXSpider V$version, build $subversion.$build started"); 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); - } -} # load Prefixes dbg("loading prefixes ..."); @@ -375,7 +378,7 @@ dbg("loading band data ..."); Bands::load(); # initialise User file system -dbg("loading user file system ..."); +dbg("loading user file system ..."); DXUser->init($userfn, 1); # look for the sysop and the alias user and complain if they aren't there @@ -395,8 +398,8 @@ dbg("Internal port: $clusteraddr $clusterport using IntMsg"); foreach my $l (@main::listen) { no strict 'refs'; my $pkg = $l->[2] || 'ExtMsg'; - my $login = $l->[3] || 'login'; - + my $login = $l->[3] || 'login'; + $conn = $pkg->new_server($l->[0], $l->[1], \&{"${pkg}::${login}"}); $conn->conns("Server $l->[0]/$l->[1] using ${pkg}::${login}"); push @listeners, $conn; @@ -420,7 +423,7 @@ unless ($DB::VERSION) { unless ($is_win) { $SIG{HUP} = 'IGNORE'; $SIG{CHLD} = sub { $zombies++ }; - + $SIG{PIPE} = sub { dbg("Broken PIPE signal received"); }; $SIG{IO} = sub { dbg("SIGIO received"); }; $SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE'; @@ -430,7 +433,7 @@ unless ($is_win) { for (keys %SIG) { if (!$SIG{$_}) { # dbg("Catching SIG $_") if isdbg('chan'); - $SIG{$_} = sub { my $sig = shift; DXDebug::confess("Caught signal $sig"); }; + $SIG{$_} = sub { my $sig = shift; DXDebug::confess("Caught signal $sig"); }; } } } @@ -460,10 +463,11 @@ Spot->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)); +$routeroot->do_pc9x(1); +$routeroot->via_pc92(1); # make sure that there is a routing OUTPUT node default file #unless (Filter::read_in('route', 'node_default', 0)) { @@ -480,7 +484,7 @@ DXMsg::clean_old(); dbg("reading cron jobs ..."); DXCron->init(); -# read in database descriptors +# read in database desriptors dbg("reading database descriptors ..."); DXDb::load(); @@ -501,22 +505,28 @@ $script->run($main::me) if $script; for (;;) { # $DB::trace = 1; - + Msg->event_loop(10, 0.010); my $timenow = time; DXChannel::process(); - + # $DB::trace = 0; - + # do timed stuff, ongoing processing happens one a second if ($timenow != $systime) { - reap if $zombies; + reap() if $zombies; $systime = $timenow; + my $days = int ($systime / 86400); + if ($systime_days != $days) { + $systime_days = $days; + $systime_daystart = $days * 86400; + } + IsoTime::update($systime); DXCron::process(); # do cron jobs DXCommandmode::process(); # process ongoing command mode stuff + DXXml::process(); DXProt::process(); # process ongoing ak1a pcxx stuff - Aranea::process(); DXConnect::process(); DXMsg::process(); DXDb::process(); @@ -524,7 +534,7 @@ for (;;) { DXDupe::process(); AGWMsg::process(); - eval { + eval { Local::process(); # do any localised processing }; dbg("Local::process error $@") if $@;