X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=b7ac117773e9f398f8a777e6d21abd56cd0d4e7e;hb=af871033ca5f1548d108bde071b268e3e01b8f73;hp=169900cc1afc5f674299d373244dafed42eba6f2;hpb=66801c1ae9040d48322fd875005fd5fc3fd25ff3;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 169900cc..b7ac1177 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -86,6 +86,7 @@ use Timer;
 use Route;
 use Route::Node;
 use Route::User;
+use Editable;
 
 use Data::Dumper;
 use IO::File;
@@ -99,20 +100,21 @@ 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 $is_win $routeroot $me
+			$clusterport $mycall $decease $is_win $routeroot $me $reqreg
 		   );
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.48";				# the version no of the software
+$version = "1.49";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();				# list of listeners
+$reqreg = 0;					# 1 = registration required, 2 = deregister people
 
 use vars qw($VERSION $BRANCH $build $branch);
 $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
 $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
-$main::build += 13;				# add an offset to make it bigger than last system
+$main::build += 12;				# add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
@@ -309,7 +311,6 @@ sub process_inqueue
 			die "\$user not defined for $call" if !defined $user;
 			# normal input
 			$dxchan->normal($line);
-			$dxchan->disconnect if ($dxchan->{state} eq 'bye');
 		} elsif ($sort eq 'Z') {
 			$dxchan->disconnect;
 		} elsif ($sort eq 'D') {
@@ -465,12 +466,6 @@ eval {
 };
 dbg("Local::init error $@") if $@;
 
-dbg("cleaning out old debug files");
-DXDebug::dbgclean();
-
-# print various flags
-#dbg("seful info - \$^D: $^D \$^W: $^W \$^S: $^S \$^P: $^P");
-
 # this, such as it is, is the main loop!
 dbg("orft we jolly well go ...");
 my $script = new Script "startup";