X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=6ddaa30b0b7f329e5aab1937ee85944087ced4d0;hb=cc49b8f8c2ec3a975c7ace3f5bd8679580288406;hp=d471b71b8aba42fcdd77ae67a2e7493f9836010e;hpb=7e3729a9039462c460dae4804f40c0bd506f3423;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index d471b71b..6ddaa30b 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -176,8 +176,6 @@ use Fcntl ':flock';
 use POSIX ":sys_wait_h";
 use Web;
 
-use vars qw($version $build $gitversion $gitbranch);
-
 use strict;
 
 use Local;
@@ -420,7 +418,7 @@ sub login
 	return \&new_channel;
 }
 
-our $ceasing;
+my $ceasing;
 
 # cease running this program, close down all the connections nicely
 sub cease
@@ -430,6 +428,8 @@ sub cease
 	cluck("ceasing") if $ceasing; 
 	
 	return if $ceasing++;
+
+	dbg("DXSpider Ceasing");
 	
 	unless ($is_win) {
 		$SIG{'TERM'} = 'IGNORE';
@@ -453,8 +453,8 @@ sub cease
 	UDPMsg::finish();
 
 	# end everything else
+	QSL::finish();
 	RBN::finish();
-	DXUser::finish();
 	DXDupe::finish();
 
 	# close all databases
@@ -465,6 +465,8 @@ sub cease
 		$l->close_server;
 	}
 
+	DXUser::finish();
+
 	LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O ended");
 	dbg("bye bye everyone - bye bye");
 	dbgclose();
@@ -598,7 +600,8 @@ sub setup_start
 	my ($year) = (gmtime)[5];
 	$year += 1900;
 	LogDbg('cluster', "DXSpider v$version build $build (git: $gitbranch/$gitversion) using perl $^V on $^O started");
-	dbg("Copyright (c) 1998-$year Dirk Koopman G1TLH");
+	LogDbg('cluster', "Copyright (c) 1998-$year Dirk Koopman G1TLH");
+	LogDbg('cluster', "Capabilities: ve7cc rbn");
 
 	# load Prefixes
 	dbg("loading prefixes ...");
@@ -893,3 +896,10 @@ cease(0);
 
 exit(0);
 
+sub END
+{
+	unless ($ceasing) {
+		print "DXSpider Ending\n";
+		cease();
+	}
+}