X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=2510c940cd5bfdc107ce2d5dac415628a1887fe3;hb=8b084abf6e46e762cc53bc58c19fd03e19f9c405;hp=1448ba9180a73748bf3faaa48cd131e47e884182;hpb=6f20114b034d329c1e2a4f91f0aba2f6ec4002d4;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 1448ba91..2510c940 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -116,12 +116,12 @@ 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 $reqreg $bumpexisting
-			$allowdxby
+			$allowdxby $dbh $dsn $dbuser $dbpass
 		   );
 
 @inqueue = ();					# the main input queue, an array of hashes
 $systime = 0;					# the time now (in seconds)
-$version = "1.51";				# the version no of the software
+$version = "1.52";				# the version no of the software
 $starttime = 0;                 # the starting time of the cluster   
 #@outstanding_connects = ();     # list of outstanding connects
 @listeners = ();				# list of listeners
@@ -172,7 +172,7 @@ sub new_channel
 	# set up the basic channel info
 	# is there one already connected to me - locally? 
 	my $user = DXUser->get_current($call);
-	my $dxchan = DXChannel->get($call);
+	my $dxchan = DXChannel::get($call);
 	if ($dxchan) {
 		if ($user && $user->is_node) {
 			already_conn($conn, $call, DXM::msg($lang, 'concluster', $call, $main::mycall));
@@ -254,13 +254,13 @@ sub cease
 	dbg("Local::finish error $@") if $@;
 
 	# disconnect nodes
-	foreach $dxchan (DXChannel->get_all_nodes) {
+	foreach $dxchan (DXChannel::get_all_nodes) {
 	    $dxchan->disconnect(2) unless $dxchan == $main::me;
 	}
 	Msg->event_loop(100, 0.01);
 
 	# disconnect users
-	foreach $dxchan (DXChannel->get_all_users) {
+	foreach $dxchan (DXChannel::get_all_users) {
 		$dxchan->disconnect;
 	}
 
@@ -287,6 +287,9 @@ sub cease
 	Log('cluster', "DXSpider V$version, build $build ended");
 	dbgclose();
 	Logclose();
+
+	$dbh->finish if $dbh;
+	
 	unlink $lockfn;
 #	$SIG{__WARN__} = $SIG{__DIE__} =  sub {my $a = shift; cluck($a); };
 	exit(0);
@@ -346,9 +349,21 @@ $build = "$build.$branch" if $branch;
 Log('cluster', "DXSpider V$version, build $build started");
 
 # banner
-dbg("Copyright (c) 1998-2002 Dirk Koopman G1TLH");
+my ($year) = (gmtime)[5];
+$year += 1900;
+dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
 dbg("DXSpider Version $version, build $build started");
 
+# try to load the database
+if ($dsn && -e "$root/perl/DXSql.pm") {
+	require DXSql;
+	import DXSql;
+	
+	if (DXSql::init()) {
+		$dbh = DXSql->new($dsn, $dbuser, $dbpass);
+	}
+}
+
 # load Prefixes
 dbg("loading prefixes ...");
 dbg(USDB::init());