X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=0c12e3a9cfa332047fbb5025b12c0efde3ff2fbf;hb=02a0660296c61b3d303497695a37d6060e359d57;hp=fb48c1e005b64b133f35169371347945b4361c26;hpb=2a9a56c26e1ed0622dc9cd7fc48b0498b059e274;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index fb48c1e0..0c12e3a9 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -36,11 +36,15 @@ BEGIN {
 	open(CLLOCK, ">$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 	print CLLOCK "$$\n";
 	close CLLOCK;
+
+	$is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
+
 }
 
 use Msg;
 use IntMsg;
 use ExtMsg;
+use AGWMsg;
 use DXVars;
 use DXDebug;
 use DXLog;
@@ -67,6 +71,7 @@ use DXDupe;
 use BadWords;
 
 use Data::Dumper;
+use IO::File;
 use Fcntl ':flock'; 
 use POSIX ":sys_wait_h";
 
@@ -75,8 +80,10 @@ use Local;
 package main;
 
 use strict;
-use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects $zombies $root
-		   @listeners $lang $myalias @debug $userfn $clusteraddr $clusterport $mycall $decease );
+use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects 
+			$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr 
+			$clusterport $mycall $decease $build $is_win
+		   );
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
@@ -94,7 +101,7 @@ sub already_conn
 	
 	dbg('chan', "-> D $call $mess\n"); 
 	$conn->send_now("D$call|$mess");
-	sleep(2);
+	Msg->sleep(2);
 	$conn->disconnect;
 }
 
@@ -102,7 +109,7 @@ sub error_handler
 {
 	my $dxchan = shift;
 	$dxchan->{conn}->set_error(undef) if exists $dxchan->{conn};
-	$dxchan->disconnect;
+	$dxchan->disconnect(1);
 }
 
 # handle incoming messages
@@ -211,6 +218,10 @@ sub cease
 		next if $dxchan->is_node;
 		$dxchan->disconnect unless $dxchan == $DXProt::me;
 	}
+
+	# disconnect AGW
+	AGWMsg::finish();
+	
 	Msg->event_loop(1, 0.05);
 	Msg->event_loop(1, 0.05);
 	Msg->event_loop(1, 0.05);
@@ -228,8 +239,8 @@ sub cease
 		$_->close_server;
 	}
 
-	dbg('chan', "DXSpider version $version ended");
-	Log('cluster', "DXSpider V$version stopped");
+	dbg('chan', "DXSpider version $version, build $build ended");
+	Log('cluster', "DXSpider V$version, build $build ended");
 	dbgclose();
 	Logclose();
 	unlink $lockfn;
@@ -309,10 +320,30 @@ foreach (@debug) {
 }
 STDOUT->autoflush(1);
 
-Log('cluster', "DXSpider V$version started");
+# calculate build number
+$build = $main::version;
+
+if (opendir(DIR, "$main::root/perl")) {
+	my @d = readdir(DIR);
+	closedir(DIR);
+	foreach my $fn (@d) {
+		if ($fn =~ /^cluster\.pl$/ || $fn =~ /\.pm$/) {
+			my $f = new IO::File "$main::root/perl/$fn" or next;
+			while (<$f>) {
+				if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)/ ) {
+					$build += $1;
+					last;
+				}
+			}
+			$f->close;
+		}
+	}
+}
+
+Log('cluster', "DXSpider V$version, build $build started");
 
 # banner
-dbg('err', "DXSpider DX Cluster Version $version", "Copyright (c) 1998-2001 Dirk Koopman G1TLH");
+dbg('err', "DXSpider Version $version, build $build started", "Copyright (c) 1998-2001 Dirk Koopman G1TLH");
 
 # load Prefixes
 dbg('err', "loading prefixes ...");
@@ -340,12 +371,13 @@ for (@main::listen) {
 	push @listeners, $conn;
 	dbg('err', "External Port: $_->[0] $_->[1]");
 }
+AGWMsg::init(\&new_channel);
 
 # load bad words
 dbg('err', "load badwords: " . (BadWords::load or "Ok"));
 
 # prime some signals
-unless ($^O =~ /^MS/) {
+unless ($is_win) {
 	unless ($DB::VERSION) {
 		$SIG{INT} = \&cease;
 		$SIG{TERM} = \&cease;
@@ -421,7 +453,7 @@ dbg('err', "orft we jolly well go ...");
 for (;;) {
 #	$DB::trace = 1;
 	
-	Msg->event_loop(25, 0.001);
+	Msg->event_loop(10, 0.010);
 	my $timenow = time;
 	process_inqueue();			# read in lines from the input queue and despatch them
 #	$DB::trace = 0;
@@ -438,7 +470,8 @@ for (;;) {
 		DXDb::process();
 		DXUser::process();
 		DXDupe::process();
-		
+		AGWMsg::process();
+				
 		eval { 
 			Local::process();       # do any localised processing
 		};