add DXCIDR, fix version no tracking

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 0db8e0bcb2e0d59354f276a41a5c2a21c098e333..143713babc1e0346bada54066d1bb5617dae601b 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -15,7 +15,13 @@ require 5.004;
 package main;
 
 # set default paths, these should be overwritten by DXVars.pm
-use vars qw($data $system $cmd $localcmd $userfn);
+use vars qw($data $system $cmd $localcmd $userfn $clusteraddr $clusterport $yes $no $user_interval $lang);
+
+$lang = 'en';                   # default language
+$yes = 'Yes';                   # visual representation of yes
+$no = 'No';                     # ditto for no
+$user_interval = 11*60;         # the interval between unsolicited prompts if no traffic
+
 
 # make sure that modules are searched in the order local then perl
 BEGIN {
@@ -115,12 +121,12 @@ use DXXml;
 use DXSql;
 use IsoTime;
 use BPQMsg;
+use DXCIDR;
 
 use Data::Dumper;
 use IO::File;
 use Fcntl ':flock';
 use POSIX ":sys_wait_h";
-use Version;
 
 use Local;
 
@@ -128,12 +134,15 @@ package main;
 
 use strict;
 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
+                       $zombies $root @listeners $lang $myalias @debug $userfn
+                       $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
                        $allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
                        $can_encode $maxconnect_user $maxconnect_node
                   );
 
+
+$clusteraddr //= '127.0.0.1';     # cluster tcp host address - used for things like console.pl
+$clusterport //= 27754;           # cluster tcp port
 @inqueue = ();                                 # the main input queue, an array of hashes
 $systime = 0;                                  # the time now (in seconds)
 $starttime = 0;                 # the starting time of the cluster
@@ -147,6 +156,8 @@ $maxconnect_node = 0;                       # Ditto but for nodes. In either case if a new incoming
                                                                # takes the no of references in the routing table above these numbers
                                                                # then the connection is refused. This only affects INCOMING connections.
 
+use vars qw($version $subversion $build $gitversion $gitbranch);
+
 # send a message to call on conn and disconnect
 sub already_conn
 {
@@ -310,7 +321,7 @@ sub cease
                $l->close_server;
        }
 
-       LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $gitversion) ended");
+       LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O ended");
        dbgclose();
        Logclose();
 
@@ -358,6 +369,8 @@ sub AGWrestart
 #
 #############################################################
 
+chdir $root;
+
 $starttime = $systime = time;
 $systime_days = int ($systime / 86400);
 $systime_daystart = $systime_days * 86400;
@@ -390,23 +403,35 @@ if (DXSql::init($dsn)) {
                import Encode;
                $can_encode = 1;
        }
-       eval { require Git; };
-       unless ($@) {
-               import Git;
+       
+       $gitbranch = 'none';
+       $gitversion = 'none';
+
+       # 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;
+               $subversion = $s || 0;
+               $build = $b || 0;
+               $gitversion = "$g\[r]";
+       }
+    if (!$@) {
+               my @branch;
                
-               # determine the real version number
-               my $repo = Git->repository(Directory => "$root/.git");
-               if ($repo) {
-                       my $desc = $repo->command_oneline(['describe'], STDERR => 0);
-                       if ($desc) {
-                               my ($v, $s, $b, $g) = $desc =~ /^([\d.]+)(?:\.(\d+))?-(\d+)-g([0-9a-f]+)/;
-                               $version = $v;
-                               $subversion = $s || 0;
-                               $build = $b || 0;
-                               $gitversion = "$g\[r]";
+               eval {@branch = `git --git-dir=$root/.git branch`};
+               unless ($@) {
+                       for (@branch) {
+                               my ($star, $b) = split /\s+/;
+                               if ($star eq '*') {
+                                       $gitbranch = $b;
+                                       last;
+                               }
                        }
                }
        }
+
        $SIG{__DIE__} = $w;
 }
 
@@ -416,7 +441,7 @@ DXXml::init();
 # banner
 my ($year) = (gmtime)[5];
 $year += 1900;
-LogDbg('cluster', "DXSpider V$version, build $subversion.$build (git: $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
@@ -453,6 +478,9 @@ DXUser->init($userfn, 1);
        }
 }
 
+# get any bad IPs 
+DXCIDR::init();
+
 # start listening for incoming messages/connects
 dbg("starting listeners ...");
 my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);