X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=230cd88e6ec7c35006a524f61e311d5f509fe720;hb=0326d584a72e15b6f0f076156a97ecf9ed6e692c;hp=0a66c1db5732a6a2448526ee77d237a734a96026;hpb=0a361c4ca62246f73ca805e2262c3edeb7317805;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 0a66c1db..230cd88e 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -25,7 +25,7 @@ BEGIN {
 
 	# try to create and lock a lockfile (this isn't atomic but 
 	# should do for now
-	my $lockfn = "$root/perl/cluster.lock";       # lock file name
+	$lockfn = "$root/perl/cluster.lck";       # lock file name
 	if (-e $lockfn) {
 		open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 		my $pid = <CLLOCK>;
@@ -41,11 +41,14 @@ BEGIN {
 	$systime = time;
 }
 
+use DXVars;
 use Msg;
 use IntMsg;
+use Internet;
+use Listeners;
 use ExtMsg;
+use AGWConnect;
 use AGWMsg;
-use DXVars;
 use DXDebug;
 use DXLog;
 use DXLogPrint;
@@ -54,21 +57,31 @@ use DXChannel;
 use DXUser;
 use DXM;
 use DXCommandmode;
+use DXProtVars;
+use DXProtout;
 use DXProt;
 use DXMsg;
 use DXCluster;
 use DXCron;
 use DXConnect;
+use DXBearing;
+use DXDb;
+use DXHash;
+use DXDupe;
 use Prefix;
+use Spot;
 use Bands;
+use Keps;
+use Minimuf;
+use Sun;
 use Geomag;
 use CmdAlias;
 use Filter;
-use DXDb;
 use AnnTalk;
+use BBS;
 use WCY;
-use DXDupe;
 use BadWords;
+use Timer;
 
 use Data::Dumper;
 use IO::File;
@@ -89,7 +102,6 @@ use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
 $systime = 0;					# the time now (in seconds)
 $version = "1.47";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
-$lockfn = "cluster.lock";       # lock file name
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();				# list of listeners
 
@@ -101,7 +113,7 @@ sub already_conn
 	
 	dbg('chan', "-> D $call $mess\n"); 
 	$conn->send_now("D$call|$mess");
-	Msg->sleep(2);
+	sleep(2);
 	$conn->disconnect;
 }
 
@@ -195,8 +207,10 @@ sub cease
 {
 	my $dxchan;
 
-	$SIG{'TERM'} = 'IGNORE';
-	$SIG{'INT'} = 'IGNORE';
+	unless ($is_win) {
+		$SIG{'TERM'} = 'IGNORE';
+		$SIG{'INT'} = 'IGNORE';
+	}
 	
 	DXUser::sync;
 
@@ -206,28 +220,21 @@ sub cease
 	dbg('local', "Local::finish error $@") if $@;
 
 	# disconnect nodes
-	foreach $dxchan (DXChannel->get_all()) {
-		next unless $dxchan->is_node;
-	    $dxchan->disconnect unless $dxchan == $DXProt::me;
+	foreach $dxchan (DXChannel->get_all_nodes) {
+	    $dxchan->disconnect(2) unless $dxchan == $DXProt::me;
 	}
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
+	Msg->event_loop(100, 0.01);
 
 	# disconnect users
-	foreach $dxchan (DXChannel->get_all()) {
-		next if $dxchan->is_node;
-		$dxchan->disconnect unless $dxchan == $DXProt::me;
+	foreach $dxchan (DXChannel->get_all_users) {
+		$dxchan->disconnect;
 	}
 
 	# disconnect AGW
 	AGWMsg::finish();
-	
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
-	Msg->event_loop(1, 0.05);
+
+	# end everything else
+	Msg->event_loop(100, 0.01);
 	DXUser::finish();
 	DXDupe::finish();
 
@@ -235,8 +242,8 @@ sub cease
 	DXDb::closeall;
 
 	# close all listeners
-	for (@listeners) {
-		$_->close_server;
+	foreach my $l (@listeners) {
+		$l->close_server;
 	}
 
 	dbg('chan', "DXSpider version $version, build $build ended");
@@ -329,21 +336,22 @@ STDOUT->autoflush(1);
 # 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;
+my @fn;
+open(CL, "$main::root/perl/cluster.pl") or die "Cannot open cluster.pl $!";
+while (<CL>) {
+	next unless /^use\s+([\w:_]+)/;
+	push @fn, $1;
+}
+close CL;
+foreach my $fn (@fn) {
+	open(CL, "$main::root/perl/${fn}.pm") or next;
+	while (<CL>) {
+		if (/^#\s+\$Id:\s+[\w\._]+,v\s+(\d+\.\d+)/ ) {
+			$build += $1;
+			last;
 		}
 	}
+	close CL;
 }
 
 Log('cluster', "DXSpider V$version, build $build started");
@@ -364,18 +372,16 @@ dbg('err', "loading user file system ...");
 DXUser->init($userfn, 1);
 
 # start listening for incoming messages/connects
-use Listeners;
-
 dbg('err', "starting listeners ...");
 my $conn = IntMsg->new_server($clusteraddr, $clusterport, \&login);
 $conn->conns("Server $clusteraddr/$clusterport");
 push @listeners, $conn;
 dbg('err', "Internal port: $clusteraddr $clusterport");
-for (@main::listen) {
-	$conn = ExtMsg->new_server($_->[0], $_->[1], \&login);
-	$conn->conns("Server $_->[0]/$_->[1]");
+foreach my $l (@main::listen) {
+	$conn = ExtMsg->new_server($l->[0], $l->[1], \&login);
+	$conn->conns("Server $l->[0]/$l->[1]");
 	push @listeners, $conn;
-	dbg('err', "External Port: $_->[0] $_->[1]");
+	dbg('err', "External Port: $l->[0] $l->[1]");
 }
 AGWrestart();
 
@@ -383,11 +389,11 @@ AGWrestart();
 dbg('err', "load badwords: " . (BadWords::load or "Ok"));
 
 # prime some signals
+unless ($DB::VERSION) {
+	$SIG{INT} = $SIG{TERM} = sub { $decease = 1 };
+}
+
 unless ($is_win) {
-	unless ($DB::VERSION) {
-		$SIG{INT} = \&cease;
-		$SIG{TERM} = \&cease;
-	}
 	$SIG{HUP} = 'IGNORE';
 	$SIG{CHLD} = sub { $zombies++ };