staging new anti spot spam code

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index b942b44f9515ee034e22679e9a328c40f2f0820c..818718f870d3459a7aa648a342c2c10f2a136fa0 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;
@@ -427,7 +428,7 @@ sub cease
                $l->close_server;
        }
 
-       LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) on $^O 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;
@@ -519,7 +522,7 @@ sub setup_start
                
                # determine the real Git build number and branch
                my $desc;
-               eval {$desc = `git describe --long`};
+               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;
@@ -529,8 +532,8 @@ sub setup_start
                }
                if (!$@) {
                        my @branch;
-                       
-                       eval {@branch = `git branch`};
+
+                       eval {@branch = `git --git-dir=$root/.git branch`};
                        unless ($@) {
                                for (@branch) {
                                        my ($star, $b) = split /\s+/;
@@ -557,7 +560,7 @@ sub setup_start
        # banner
        my ($year) = (gmtime)[5];
        $year += 1900;
-       LogDbg('cluster', "DXSpider V$version, build $build (git: $gitbranch/$gitversion) on $^O 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
@@ -788,7 +791,7 @@ sub per_sec
        DXCron::process();                      # do cron jobs
        RBN::process();
 
-       Timer::handler();
+       DXTimer::handler();
        DXLog::flushall();
 }