X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=d321cba5fcd9b971e4cb048857aa539065daa253;hb=db7747a775a39ec1828fc78b9442f301ed32b195;hp=5c53e113d0e8dbc02907e6e055f334d6df03bc4b;hpb=df3ec97bdbac858d3ba8cc1d78e8bd0bb4f6ea84;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 5c53e113..d321cba5 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -69,6 +69,7 @@ use DXDb;
 use DXHash;
 use DXDupe;
 use Prefix;
+use Spot;
 use Bands;
 use Keps;
 use Minimuf;
@@ -99,7 +100,7 @@ use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects
 
 @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
+$version = "1.48";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();				# list of listeners
@@ -109,7 +110,8 @@ $starttime = 0;                 # the starting time of the cluster
 sub already_conn
 {
 	my ($conn, $call, $mess) = @_;
-	
+
+	$conn->disable_read(1);
 	dbg('chan', "-> D $call $mess\n"); 
 	$conn->send_now("D$call|$mess");
 	sleep(2);
@@ -146,7 +148,7 @@ sub new_channel
 			;
 		} else {
 			if (my $ref = DXCluster->get_exact($call)) {
-				my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
+				my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->dxchancall);
 				already_conn($conn, $call, $mess);
 				return;
 			}
@@ -154,7 +156,7 @@ sub new_channel
 		$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
 	} else {
 		if (my $ref = DXCluster->get_exact($call)) {
-			my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->call);
+			my $mess = DXM::msg($lang, 'concluster', $call, $ref->mynode->dxchancall);
 			already_conn($conn, $call, $mess);
 			return;
 		}
@@ -206,8 +208,10 @@ sub cease
 {
 	my $dxchan;
 
-	$SIG{'TERM'} = 'IGNORE';
-	$SIG{'INT'} = 'IGNORE';
+	unless ($is_win) {
+		$SIG{'TERM'} = 'IGNORE';
+		$SIG{'INT'} = 'IGNORE';
+	}
 	
 	DXUser::sync;
 
@@ -386,11 +390,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++ };