X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=e1e75472223fc7beef785258b1f43b7cb7826320;hb=5db4d809b67ab2650366039f7585e6479d8f13a8;hp=d7dd9a0c4fb2469fdd95241c70749e3429491fe5;hpb=495e620d66fbc1b8c64dd65ff8d89fc43a2e6f08;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index d7dd9a0c..e1e75472 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -8,18 +8,18 @@
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
 # $Id$
-# 
+#
 
 require 5.004;
 
 # make sure that modules are searched in the order local then perl
 BEGIN {
 	umask 002;
-	
+
 	# root of directory tree for this system
-	$root = "/spider"; 
+	$root = "/spider";
 	$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
-	
+
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
 
@@ -27,11 +27,11 @@ BEGIN {
 	die "The directory $root doesn't exist, please RTFM" unless -d $root;
 	die "$root/local doesn't exist, please RTFM" unless -d "$root/local";
 	die "$root/local/DXVars.pm doesn't exist, please RTFM" unless -e "$root/local/DXVars.pm";
-	
+
 	mkdir "$root/local_cmd", 0777 unless -d "$root/local_cmd";
-	
 
-	# try to create and lock a lockfile (this isn't atomic but 
+
+	# try to create and lock a lockfile (this isn't atomic but
 	# should do for now
 	$lockfn = "$root/local/cluster.lck";       # lock file name
 	if (-e $lockfn) {
@@ -105,7 +105,7 @@ use IsoTime;
 
 use Data::Dumper;
 use IO::File;
-use Fcntl ':flock'; 
+use Fcntl ':flock';
 use POSIX ":sys_wait_h";
 use Version;
 
@@ -114,8 +114,8 @@ use Local;
 package main;
 
 use strict;
-use vars qw(@inqueue $systime $starttime $lockfn @outstanding_connects 
-			$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr 
+use vars qw(@inqueue $systime $starttime $lockfn @outstanding_connects
+			$zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr
 			$clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting
 			$allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart
 			$can_encode
@@ -123,7 +123,7 @@ use vars qw(@inqueue $systime $starttime $lockfn @outstanding_connects
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$starttime = 0;                 # the starting time of the cluster   
+$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
@@ -137,7 +137,7 @@ sub already_conn
 	my ($conn, $call, $mess) = @_;
 
 	$conn->disable_read(1);
-	dbg("-> D $call $mess\n") if isdbg('chan'); 
+	dbg("-> D $call $mess\n") if isdbg('chan');
 	$conn->send_now("D$call|$mess");
 	sleep(2);
 	$conn->disconnect;
@@ -163,7 +163,7 @@ sub new_channel
 	}
 
 	# set up the basic channel info
-	# is there one already connected to me - locally? 
+	# is there one already connected to me - locally?
 	my $user = DXUser->get_current($call);
 	my $dxchan = DXChannel::get($call);
 	if ($dxchan) {
@@ -195,13 +195,13 @@ sub new_channel
 			return;
 		}
 	}
-	
+
 	if ($user) {
 		$user->{lang} = $main::lang if !$user->{lang}; # to autoupdate old systems
 	} else {
 		$user = DXUser->new($call);
 	}
-	
+
 	# create the channel
 	if ($user->is_node) {
 		$dxchan = DXProt->new($call, $conn, $user);
@@ -237,7 +237,7 @@ sub cease
 		$SIG{'TERM'} = 'IGNORE';
 		$SIG{'INT'} = 'IGNORE';
 	}
-	
+
 	DXUser::sync;
 
 	eval {
@@ -275,12 +275,12 @@ sub cease
 		$l->close_server;
 	}
 
-	LogDbg('cluster', "DXSpider V$version, build $build ended");
+	LogDbg('cluster', "DXSpider V$version, build $subversion.$build ended");
 	dbgclose();
 	Logclose();
 
 	$dbh->finish if $dbh;
-	
+
 	unlink $lockfn;
 #	$SIG{__WARN__} = $SIG{__DIE__} =  sub {my $a = shift; cluck($a); };
 	exit(0);
@@ -319,13 +319,13 @@ sub AGWrestart
 
 #############################################################
 #
-# The start of the main line of code 
+# The start of the main line of code
 #
 #############################################################
 
 $starttime = $systime = time;
 $systime_days = int ($systime / 86400);
-$systime_daystart = $systime_days * 86400; 
+$systime_daystart = $systime_days * 86400;
 $lang = 'en' unless $lang;
 
 unless ($DB::VERSION) {
@@ -347,7 +347,7 @@ if (DXSql::init($dsn)) {
 
 # try to load Encode
 {
-	no warnings;
+	local $^W = 0;
 	my $w = $SIG{__DIE__};
 	$SIG{__DIE__} = 'IGNORE';
 	eval { require Encode; };
@@ -364,7 +364,7 @@ DXXml::init();
 # banner
 my ($year) = (gmtime)[5];
 $year += 1900;
-LogDbg('cluster', "DXSpider V$version, build $build started");
+LogDbg('cluster', "DXSpider V$version, build $subversion.$build started");
 dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
 
 # load Prefixes
@@ -378,7 +378,7 @@ dbg("loading band data ...");
 Bands::load();
 
 # initialise User file system
-dbg("loading user file system ..."); 
+dbg("loading user file system ...");
 DXUser->init($userfn, 1);
 
 # look for the sysop and the alias user and complain if they aren't there
@@ -398,8 +398,8 @@ dbg("Internal port: $clusteraddr $clusterport using IntMsg");
 foreach my $l (@main::listen) {
 	no strict 'refs';
 	my $pkg = $l->[2] || 'ExtMsg';
-	my $login = $l->[3] || 'login'; 
-	
+	my $login = $l->[3] || 'login';
+
 	$conn = $pkg->new_server($l->[0], $l->[1], \&{"${pkg}::${login}"});
 	$conn->conns("Server $l->[0]/$l->[1] using ${pkg}::${login}");
 	push @listeners, $conn;
@@ -423,7 +423,7 @@ unless ($DB::VERSION) {
 unless ($is_win) {
 	$SIG{HUP} = 'IGNORE';
 	$SIG{CHLD} = sub { $zombies++ };
-	
+
 	$SIG{PIPE} = sub { 	dbg("Broken PIPE signal received"); };
 	$SIG{IO} = sub { 	dbg("SIGIO received"); };
 	$SIG{WINCH} = $SIG{STOP} = $SIG{CONT} = 'IGNORE';
@@ -433,7 +433,7 @@ unless ($is_win) {
 	for (keys %SIG) {
 		if (!$SIG{$_}) {
 			#		dbg("Catching SIG $_") if isdbg('chan');
-			$SIG{$_} = sub { my $sig = shift;	DXDebug::confess("Caught signal $sig");  }; 
+			$SIG{$_} = sub { my $sig = shift;	DXDebug::confess("Caught signal $sig");  };
 		}
 	}
 }
@@ -505,14 +505,14 @@ $script->run($main::me) if $script;
 
 for (;;) {
 #	$DB::trace = 1;
-	
+
 	Msg->event_loop(10, 0.010);
 	my $timenow = time;
 
 	DXChannel::process();
-	
+
 #	$DB::trace = 0;
-	
+
 	# do timed stuff, ongoing processing happens one a second
 	if ($timenow != $systime) {
 		reap() if $zombies;
@@ -534,7 +534,7 @@ for (;;) {
 		DXDupe::process();
 		AGWMsg::process();
 
-		eval { 
+		eval {
 			Local::process();       # do any localised processing
 		};
 		dbg("Local::process error $@") if $@;