X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=3bed469c69085a786766ddc96008769ce3a39151;hb=db19182c4e93525b5f4b216ffec2e63c95f52eb8;hp=b3b4c5a64595547862a84b244d7d0ab14850b0eb;hpb=9630876e30f288575b5343ec2d0b5bb6d67f92cc;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index b3b4c5a6..3bed469c 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>;
@@ -36,12 +36,19 @@ 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?
+	$systime = time;
 }
 
+use DXVars;
 use Msg;
 use IntMsg;
+use Internet;
+use Listeners;
 use ExtMsg;
-use DXVars;
+use AGWConnect;
+use AGWMsg;
 use DXDebug;
 use DXLog;
 use DXLogPrint;
@@ -50,21 +57,30 @@ 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 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;
@@ -78,14 +94,13 @@ 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 $build
+			$clusterport $mycall $decease $build $is_win
 		   );
 
 @inqueue = ();					# the main input queue, an array of hashes
 $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
 
@@ -214,6 +229,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);
@@ -296,6 +315,12 @@ sub uptime
 	my $mins = int $t / 60;
 	return sprintf "%d %02d:%02d", $days, $hours, $mins;
 }
+
+sub AGWrestart
+{
+	AGWMsg::init(\&new_channel);
+}
+
 #############################################################
 #
 # The start of the main line of code 
@@ -315,21 +340,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");
@@ -350,8 +376,6 @@ 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");
@@ -363,12 +387,13 @@ for (@main::listen) {
 	push @listeners, $conn;
 	dbg('err', "External Port: $_->[0] $_->[1]");
 }
+AGWrestart();
 
 # 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;
@@ -461,7 +486,8 @@ for (;;) {
 		DXDb::process();
 		DXUser::process();
 		DXDupe::process();
-		
+		AGWMsg::process();
+				
 		eval { 
 			Local::process();       # do any localised processing
 		};