X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=d62b88b10840e291033e627f10b3e037b90b5698;hb=a24cc09d8262093df92c767d3010c0a5fd6e42d7;hp=db05800f9c305216aa06bcec7e707930ffb71c96;hpb=e637d28f26ba92ea69edb06c6c564e1acfffd75e;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index db05800f..d62b88b1 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -12,7 +12,7 @@
 
 package main;
 
-require 5.10.1;
+require 5.16.1;
 
 use warnings;
 
@@ -21,15 +21,15 @@ use vars qw($root $is_win $systime $lockfn @inqueue $starttime $lockfn @outstand
 			$clusterport $mycall $decease $routeroot $me $reqreg $bumpexisting
 			$allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
 			$can_encode $maxconnect_user $maxconnect_node $idle_interval $log_flush_interval
-			$broadcast_debug 
+			$broadcast_debug $yes $no $user_interval
 		   );
 
-$lang = 'en';					# default language
-$clusteraddr = '127.0.0.1';		# cluster tcp host address - used for things like console.pl
-$clusterport = 27754;			# cluster tcp port
-$yes = 'Yes';					# visual representation of yes
-$no = 'No';						# ditto for no
-$user_interval = 11*60;			# the interval between unsolicited prompts if no traffic
+#$lang = 'en';					# default language
+#$clusteraddr = '127.0.0.1';		# cluster tcp host address - used for things like console.pl
+#$clusterport = 27754;			# cluster tcp port
+#$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 {
@@ -138,7 +138,7 @@ use AnnTalk;
 use BBS;
 use WCY;
 use BadWords;
-use Timer;
+use DXTimer;
 use Route;
 use Route::Node;
 use Route::User;
@@ -166,6 +166,13 @@ use strict;
 
 use Local;
 
+$lang //= 'en';					# default language
+$clusteraddr //= '127.0.0.1';   # cluster tcp host address - used for things like console.pl
+$clusterport //= 27754;			# cluster tcp port
+$yes //= 'Yes';					# visual representation of yes
+$no //= 'No';				    # ditto for no
+$user_interval //= 11*60;		# the interval between unsolicited prompts if no traffic
+
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
@@ -428,7 +435,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();
@@ -522,7 +529,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;
@@ -532,8 +539,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+/;
@@ -560,7 +567,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
@@ -578,6 +585,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
@@ -791,7 +801,7 @@ sub per_sec
 	DXCron::process();			# do cron jobs
 	RBN::process();
 
-	Timer::handler();
+	DXTimer::handler();
 	DXLog::flushall();
 }