X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=1af0388a3449ed82a9bfdeb7a370f4579505e3a8;hb=2f4355fb63f336cce61887b189d5556faf1734d7;hp=b1b330b2c983f1377ed82faf0dba5397b38d9886;hpb=80a2dd317e5d6b24250388b5177cbf85abee5a85;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index b1b330b2..1af0388a 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -61,13 +61,13 @@ use Filter;
 use Local;
 use Fcntl ':flock'; 
 
-use Carp;
+use Carp qw(cluck);
 
 package main;
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.28";				# the version no of the software
+$version = "1.30";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 $lockfn = "cluster.lock";       # lock file name
       
@@ -107,13 +107,14 @@ sub rec
 		my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
 
                 # is there one already connected to me ? 
-		if ($dxchan = DXChannel->get($call)) {
-			disconnect($dxchan);
-			sleep(1);
+		my $user = DXUser->get($call);
+		if (DXChannel->get($call)) {
+		        my $mess = DXM::msg($lang, $user->sort eq 'A' ? 'concluster' : 'conother', $call);
+			already_conn($conn, $call, $mess);
+			return;
 		}
 		
 		# is there one already connected elsewhere in the cluster (and not a cluster)
-		my $user = DXUser->get($call);
 		if ($user) {
 			if (($user->sort eq 'A' || $call eq $myalias) && !DXCluster->get_exact($call)) {
 				;
@@ -173,8 +174,22 @@ sub cease
 		Local::finish();   # end local processing
 	};
 	dbg('local', "Local::finish error $@") if $@;
-	
+
+	# disconnect users
+	foreach $dxchan (DXChannel->get_all()) {
+		next if $dxchan->is_ak1a;
+		disconnect($dxchan) unless $dxchan == $DXProt::me;
+	}
+	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);
+
+	# disconnect nodes
 	foreach $dxchan (DXChannel->get_all()) {
+		next unless $dxchan->is_ak1a;
 		disconnect($dxchan) unless $dxchan == $DXProt::me;
 	}
 	Msg->event_loop(1, 0.05);
@@ -192,7 +207,10 @@ sub cease
 	DXUser::finish();
 	dbg('chan', "DXSpider version $version ended");
 	Log('cluster', "DXSpider V$version stopped");
+	dbgclose();
+	Logclose();
 	unlink $lockfn;
+#	$SIG{__WARN__} = $SIG{__DIE__} =  sub {my $a = shift; cluck($a); };
 	exit(0);
 }
 
@@ -212,7 +230,7 @@ sub process_inqueue
 	
 	my $data = $self->{data};
 	my $dxchan = $self->{dxchan};
-	my ($sort, $call, $line) = $data =~ /^(\w)(\S+)\|(.*)$/;
+	my ($sort, $call, $line) = $data =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
 
 	# the above regexp must work
 	return unless ($sort && $call && $line);
@@ -220,8 +238,8 @@ sub process_inqueue
 	# translate any crappy characters into hex characters 
 	if ($line =~ /[\x00-\x06\x08\x0a-\x1f\x7f-\xff]/o) {
 		$line =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
-		dbg('chan', "<- $sort $call **CRAP**: $line");
-		return;
+#		dbg('chan', "<- $sort $call **CRAP**: $line");
+#		return;
 	}
 	
 	# do the really sexy console interface bit! (Who is going to do the TK interface then?)
@@ -266,6 +284,7 @@ sub uptime
 $starttime = $systime = time;
 
 # open the debug file, set various FHs to be unbuffered
+dbginit();
 foreach (@debug) {
 	dbgadd($_);
 }
@@ -355,6 +374,7 @@ for (;;) {
 		DXCommandmode::process(); # process ongoing command mode stuff
 		DXProt::process();		# process ongoing ak1a pcxx stuff
 		DXConnect::process();
+		DXMsg::process();
 		eval { 
 			Local::process();       # do any localised processing
 		};