route cache, wcy, wwv. ann caching

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index c9b49182d09f9965c7174e295bd833649f514525..ffdfa42df1fd691acca53f4ed674a8c48cc8032c 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -90,6 +90,7 @@ BEGIN {
        
 }
 
+
 use DXVars;
 use SysVar;
 
@@ -137,7 +138,7 @@ use AnnTalk;
 use BBS;
 use WCY;
 use BadWords;
-use Timer;
+use DXTimer;
 use Route;
 use Route::Node;
 use Route::User;
@@ -263,8 +264,8 @@ sub new_channel
                        $lock = $user->lockout;
                } elsif ($basecall ne $call) {
                        # if there isn't a SSID on the $call, then try the base
-                       $user = DXUser::get_current($basecall);
-                       $lock = $user->lockout if $user;
+                       my $luser = DXUser::get_current($basecall);
+                       $lock = $luser->lockout if $luser;
                }
 
                # now deal with the lock
@@ -427,7 +428,7 @@ sub cease
                $l->close_server;
        }
 
-       LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) ended");
+       LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O ended");
        dbg("bye bye everyone - bye bye");
        dbgclose();
        Logclose();
@@ -478,6 +479,8 @@ sub setup_start
        #
        #############################################################
 
+       chdir $root;
+       
        $starttime = $systime = time;
        $systime_days = int ($systime / 86400);
        $systime_daystart = $systime_days * 86400;
@@ -513,26 +516,25 @@ sub setup_start
                        import Encode;
                        $can_encode = 1;
                }
+
                $gitbranch = 'none';
                $gitversion = 'none';
-               eval { require Git; };
-               unless ($@) {
-                       import Git;
                
-                       # determine the real version number
-                       my $repo = Git->repository(Directory => "$root/.git");
-                       if ($repo) {
-                               my $desc = $repo->command_oneline(['describe', '--long'], STDERR => 0);
-                               if ($desc) {
-                                       my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
-                                       $s ||= '';
-                                       dbg("Git: $desc") if isdbg('git');
-                                       dbg("Git: V=$v S=$s B=$b g=$g") if isdbg('git');
-                                       $version = $v;
-                                       $build = $b || 0;
-                                       $gitversion = "$g\[r]";
-                               }
-                               my @branch = $repo->command([qw{branch}], STDERR=>0);
+               # determine the real Git build number and branch
+               my $desc;
+               eval {$desc = `git --git-dir=$root/.git describe --long`};
+               if (!$@ && $desc) {
+                       my ($v, $s, $b, $g) = $desc =~ /^([\d\.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
+                       $version = $v;
+                       my $subversion = $s || 0; # not used elsewhere
+                       $build = $b || 0;
+                       $gitversion = "$g\[r]";
+               }
+               if (!$@) {
+                       my @branch;
+
+                       eval {@branch = `git --git-dir=$root/.git branch`};
+                       unless ($@) {
                                for (@branch) {
                                        my ($star, $b) = split /\s+/;
                                        if ($star eq '*') {
@@ -542,16 +544,23 @@ sub setup_start
                                }
                        }
                }
+
                $SIG{__DIE__} = $w;
        }
 
+       # setup location of motd & issue
+       localdata_mv($motd);
+       $motd = localdata($motd);
+       localdata_mv("issue");
+       
+
        # try to load XML::Simple
        DXXml::init();
 
        # banner
        my ($year) = (gmtime)[5];
        $year += 1900;
-       LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) started");
+       LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O started");
        dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
 
        # load Prefixes
@@ -569,6 +578,9 @@ sub setup_start
        DXUser::init(4);                        # version 4 == json format
 
        Filter::init();                         # doesn't do much, but has to be done
+
+       AnnTalk::init();                        # initialise announce cache
+       
        
 
        # look for the sysop and the alias user and complain if they aren't there
@@ -660,14 +672,14 @@ sub setup_start
        dbg("Start WCY");
        WCY->init();
 
-       # initial the Spot stuff
-       dbg("Starting DX Spot system");
-       Spot->init();
-
        # initialise the protocol engine
        dbg("Start Protocol Engines ...");
        DXProt->init();
 
+       # read startup script
+       my $script = new Script "startup";
+       $script->run($main::me) if $script;
+
        # 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);
@@ -679,6 +691,10 @@ sub setup_start
        #       $Route::filterdef->cmd($main::me, 'route', 'accept', "node_default call $mycall" );
        #}
 
+       # initial the Spot stuff
+       dbg("Starting DX Spot system");
+       Spot->init();
+
        # read in any existing message headers and clean out old crap
        dbg("reading existing message headers ...");
        DXMsg->init();
@@ -708,8 +724,6 @@ sub setup_start
 
        # this, such as it is, is the main loop!
        dbg("orft we jolly well go ...");
-       my $script = new Script "startup";
-       $script->run($main::me) if $script;
 
        #open(DB::OUT, "|tee /tmp/aa");
 }
@@ -780,7 +794,7 @@ sub per_sec
        DXCron::process();                      # do cron jobs
        RBN::process();
 
-       Timer::handler();
+       DXTimer::handler();
        DXLog::flushall();
 }