X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=d3c905340ee7cf7d2875712c0bd467695b9739ec;hb=a386178f3c1bfcd3d0975d94448245b8c4203988;hp=c517a23179d9d2eb35c8849bde6d57490bca12e0;hpb=7b9256ceade8b18b48f848c9ac659c2de7322b0b;p=spider.git diff --git a/perl/cluster.pl b/perl/cluster.pl index c517a231..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) { @@ -105,7 +105,7 @@ use IsoTime; use Data::Dumper; use IO::File; -use Fcntl ':flock'; +use Fcntl ':flock'; use POSIX ":sys_wait_h"; use Version; @@ -114,16 +114,17 @@ use Local; package main; use strict; -use vars qw(@inqueue $systime $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 $do_xml $systime_days $systime_daystart + $can_encode ); @inqueue = (); # the main input queue, an array of hashes $systime = 0; # the time now (in seconds) -$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 @@ -136,7 +137,7 @@ 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; @@ -162,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) { @@ -194,13 +195,13 @@ sub new_channel 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); @@ -236,7 +237,7 @@ sub cease $SIG{'TERM'} = 'IGNORE'; $SIG{'INT'} = 'IGNORE'; } - + DXUser::sync; eval { @@ -274,12 +275,12 @@ sub cease $l->close_server; } - LogDbg('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); @@ -318,13 +319,13 @@ 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; +$systime_daystart = $systime_days * 86400; $lang = 'en' unless $lang; unless ($DB::VERSION) { @@ -344,13 +345,26 @@ if (DXSql::init($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; +} + # try to load XML::Simple DXXml::init(); # banner my ($year) = (gmtime)[5]; $year += 1900; -LogDbg('cluster', "DXSpider V$version, build $build started"); +LogDbg('cluster', "DXSpider V$version, build $subversion.$build started"); dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH"); # load Prefixes @@ -364,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 @@ -384,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; @@ -409,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'; @@ -419,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"); }; } } } @@ -470,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(); @@ -491,14 +505,14 @@ $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; @@ -520,7 +534,7 @@ for (;;) { DXDupe::process(); AGWMsg::process(); - eval { + eval { Local::process(); # do any localised processing }; dbg("Local::process error $@") if $@;