X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=07fd6ab594630c0606a48bae4932f3abf38e4d2d;hb=2ca690592ea14e2ecd6783feed99ed7a8195162c;hp=bd8de8c3c2229ffc1195819680063ae06b0e28ec;hpb=c8a6bc3e45bfbbaad776f4a6f22b3e501c8fc1c9;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index bd8de8c3..07fd6ab5 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -31,7 +31,6 @@ $yes = 'Yes';					# visual representation of yes
 $no = 'No';						# ditto for no
 $user_interval = 11*60;			# the interval between unsolicited prompts if no traffic
 
-
 # make sure that modules are searched in the order local then perl
 BEGIN {
 	umask 002;
@@ -41,12 +40,16 @@ BEGIN {
 	eval {
 		require local::lib;
 	};
-	import local::lib unless ($@);
+	unless ($@) {
+#		import local::lib;
+		import local::lib qw(/spider/perl5lib);
+	} 
 
 	# root of directory tree for this system
 	$root = "/spider";
 	$root = $ENV{'DXSPIDER_ROOT'} if $ENV{'DXSPIDER_ROOT'};
 
+	unshift @INC, "$root/perl5lib" unless grep {$_ eq "$root/perl5lib"} @INC;
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
 
@@ -412,6 +415,7 @@ sub cease
 	UDPMsg::finish();
 
 	# end everything else
+	RBN::finish();
 	DXUser::finish();
 	DXDupe::finish();
 
@@ -484,12 +488,14 @@ sub setup_start
 	}
 
 	# open the debug file, set various FHs to be unbuffered
-	dbginit($broadcast_debug ? \&DXCommandmode::broadcast_debug : undef);
+	dbginit(undef, $broadcast_debug ? \&DXCommandmode::broadcast_debug : undef);
 	foreach (@debug) {
 		dbgadd($_);
 	}
 	STDOUT->autoflush(1);
 
+	# log our path
+	dbg "Perl path: " . join(':', @INC);
 	
 	# try to load the database
 	if (DXSql::init($dsn)) {
@@ -562,6 +568,9 @@ sub setup_start
 	dbg("loading user file system ...");
 	DXUser::init(4);			# version 4 == json format
 
+	Filter::init();				# doesn't do much, but has to be done
+	
+
 	# look for the sysop and the alias user and complain if they aren't there
 	{
 		die "\$myalias \& \$mycall are the same ($mycall)!, they must be different (hint: make \$mycall = '${mycall}-2';). Oh and don't forget to rerun create_sysop.pl!" if $mycall eq $myalias;
@@ -683,6 +692,9 @@ sub setup_start
 	dbg("reading database descriptors ...");
 	DXDb::load();
 
+	dbg("starting RBN ...");
+	RBN::init();
+
 	# starting local stuff
 	dbg("doing local initialisation ...");
 	QSL::init(1);
@@ -766,7 +778,8 @@ sub per_sec
 	DXUser::process();
 	AGWMsg::process();
 	DXCron::process();			# do cron jobs
-	
+	RBN::process();
+
 	Timer::handler();
 	DXLog::flushall();
 }