X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=b9031719718fc291e1ef18343a65b4639af872a8;hb=2f9d089ec33dd606824c11a508dbc06a0cf8dfaa;hp=a33e6da5f1a8e76b2907cf8547791702a146cdd9;hpb=537a4a109f291c206d754ec2067d49f9964cca08;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index a33e6da5..b9031719 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -12,6 +12,19 @@
 
 require 5.004;
 
+package main;
+
+# set default paths, these should be overwritten by DXVars.pm
+use vars qw($data $system $cmd $localcmd $userfn $clusteraddr $clusterport $yes $no $user_interval $lang);
+
+$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 {
 	umask 002;
@@ -30,15 +43,23 @@ BEGIN {
 
 	mkdir "$root/local_cmd", 0777 unless -d "$root/local_cmd";
 
+	$data = "$root/data";
+	$system = "$root/sys";
+	$cmd = "$root/cmd";
+	$localcmd = "$root/local_cmd";
+	$userfn = "$data/users";
 
 	# 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) {
+	if (-w $lockfn) {
 		open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 		my $pid = <CLLOCK>;
-		chomp $pid;
-		die "Lockfile ($lockfn) and process $pid exist, another cluster running?" if kill 0, $pid;
+		if ($pid) {
+			chomp $pid;
+			die "Lockfile ($lockfn) and process $pid exist, another cluster running?" if kill 0, $pid;
+		}
+		unlink $lockfn;
 		close CLLOCK;
 	}
 	open(CLLOCK, ">$lockfn") or die "Can't open Lockfile ($lockfn) $!";
@@ -115,8 +136,8 @@ 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
 		   );
@@ -367,7 +388,7 @@ if (DXSql::init($dsn)) {
 	$dbh = $dbh->connect($dsn, $dbuser, $dbpass) if $dbh;
 }
 
-# try to load Encode
+# try to load Encode and Git
 {
 	local $^W = 0;
 	my $w = $SIG{__DIE__};
@@ -377,6 +398,23 @@ if (DXSql::init($dsn)) {
 		import Encode;
 		$can_encode = 1;
 	}
+	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'], 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]";
+			}
+		}
+	}
 	$SIG{__DIE__} = $w;
 }
 
@@ -403,13 +441,24 @@ Bands::load();
 dbg("loading user file system ...");
 DXUser->init($userfn, 1);
 
+
 # look for the sysop and the alias user and complain if they aren't there
 {
 	die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';). Oh and don't forget to rerun create_sysop.pl!" if $mycall eq $myalias;
 	my $ref = DXUser::get($mycall);
 	die "$mycall missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+	my $oldsort = $ref->sort;
+	if ($oldsort ne 'S') {
+		$ref->sort('S');
+		dbg "Resetting node type from $oldsort -> DXSpider ('S')";
+	}
 	$ref = DXUser::get($myalias);
 	die "$myalias missing, run the create_sysop.pl script and please RTFM" unless $ref && $ref->priv == 9;
+	$oldsort = $ref->sort;
+	if ($oldsort ne 'U') {
+		$ref->sort('U');
+		dbg "Resetting sysop user type from $oldsort -> User ('U')";
+	}
 }
 
 # start listening for incoming messages/connects
@@ -564,6 +613,8 @@ for (;;) {
 		AGWMsg::process();
 		BPQMsg::process();
 
+		DXLog::flushall();
+		
 		if (defined &Local::process) {
 			eval {
 				Local::process();       # do any localised processing