X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=60fc1afda1d69c2572710e9252445e4149f75d5f;hb=28b4b03213440a9951d68da6ef1f5c17a327e002;hp=3bc4218ce289363e458be4f28fb6e1c14a472a56;hpb=a48eea32af123b571889f70a3e7cef8e157cf389;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 3bc4218c..60fc1afd 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -16,6 +16,7 @@ use IO::File;
 use DXDebug;
 use DXUtil;
 use LRU;
+use File::Copy;
 
 use strict;
 
@@ -89,6 +90,7 @@ $v3 = 0;
 		  build => '1,Build',
 		  believe => '1,Believable nodes,parray',
 		  lastping => '1,Last Ping at,ptimelist',
+		  maxconnect => '1,Max Connections',
 		 );
 
 #no strict;
@@ -114,10 +116,8 @@ sub AUTOLOAD
 #
 sub init
 {
-	my ($pkg, $fn, $mode) = @_;
+	my $mode = shift;
   
-	confess "need a filename in User" if !$fn;
-
 	my $ufn;
 	my $convert;
 	
@@ -125,10 +125,10 @@ sub init
 		require Storable;
 	};
 
-#	eval "use Storable qw(nfreeze thaw)";
+	my $fn = "users";
 	
 	if ($@) {
-		$ufn = "$fn.v2";
+		$ufn = localdata("users.v2");
 		$v3 = $convert = 0;
 		dbg("the module Storable appears to be missing!!");
 		dbg("trying to continue in compatibility mode (this may fail)");
@@ -136,9 +136,9 @@ sub init
 	} else {
 		import Storable qw(nfreeze thaw);
 
-		$ufn = "$fn.v3";
+		$ufn = localdata("users.v3");
 		$v3 = 1;
-		$convert++ if -e "$fn.v2" && !-e $ufn;
+		$convert++ if -e localdata("users.v2") && !-e $ufn;
 	}
 	
 	if ($mode) {
@@ -158,7 +158,7 @@ sub init
 		my %oldu;
 		dbg("Converting the User File to V3 ");
 		dbg("This will take a while, I suggest you go and have cup of strong tea");
-		my $odbm = tie (%oldu, 'DB_File', "$fn.v2", O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn.v2 ($!) [rebuild it from user_asc?]";
+		my $odbm = tie (%oldu, 'DB_File', localdata("users.v2"), O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn.v2 ($!) [rebuild it from user_asc?]";
         for ($action = R_FIRST; !$odbm->seq($key, $val, $action); $action = R_NEXT) {
 			my $ref = asc_decode($val);
 			if ($ref) {
@@ -177,9 +177,7 @@ sub init
 
 sub del_file
 {
-	my ($pkg, $fn) = @_;
-  
-	confess "need a filename in User" if !$fn;
+	my $fn = localdata("users");
 	$fn .= $v3 ? ".v3" : ".v2";
 	unlink $fn;
 }
@@ -190,7 +188,7 @@ sub del_file
 sub process
 {
 	if ($main::systime > $lasttime + 15) {
-		$dbm->sync;
+		$dbm->sync if $dbm;
 		$lasttime = $main::systime;
 	}
 }
@@ -248,12 +246,13 @@ sub get
 	unless ($dbm->get($call, $data)) {
 		$ref = decode($data);
 		if ($ref) {
-			if (ref $ref ne 'DXUser') {
-				dbg("DXUser::get: got strange answer from decode ". ref $ref. " ignoring");
+			if (!UNIVERSAL::isa($ref, 'DXUser')) {
+				dbg("DXUser::get: got strange answer from decode of $call". ref $ref. " ignoring");
 				return undef;
 			}
+			# we have a reference and it *is* a DXUser
 		} else {
-			dbg("DXUser::get: no reference returned from decode $!");
+			dbg("DXUser::get: no reference returned from decode of $call $!");
 			return undef;
 		}
 		$lru->put($call, $ref);
@@ -277,9 +276,9 @@ sub get_current
 	my $dxchan = DXChannel::get($call);
 	if ($dxchan) {
 		my $ref = $dxchan->user;
-		return $ref if ref $ref eq 'DXUser';
+		return $ref if $ref && UNIVERSAL::isa($ref, 'DXUser');
 
-		dbg("DXUser::get_current: got invalid user ref from dxchan $dxchan->{call} ". ref $ref. " ignoring");
+		dbg("DXUser::get_current: got invalid user ref for $call from dxchan $dxchan->{call} ". ref $ref. " ignoring");
 	}
 	return get($call);
 }
@@ -413,15 +412,17 @@ sub fields
 
 sub export
 {
-	my $fn = shift;
+	my $name = shift;
 	my $basic_info_only = shift;
+
+	my $fn = "$main::local_data/$name";
 	
 	# save old ones
-	rename "$fn.oooo", "$fn.ooooo" if -e "$fn.oooo";
-	rename "$fn.ooo", "$fn.oooo" if -e "$fn.ooo";
-	rename "$fn.oo", "$fn.ooo" if -e "$fn.oo";
-	rename "$fn.o", "$fn.oo" if -e "$fn.o";
-	rename "$fn", "$fn.o" if -e "$fn";
+	move "$fn.oooo", "$fn.ooooo" if -e "$fn.oooo";
+	move "$fn.ooo", "$fn.oooo" if -e "$fn.ooo";
+	move "$fn.oo", "$fn.ooo" if -e "$fn.oo";
+	move "$fn.o", "$fn.oo" if -e "$fn.o";
+	move "$fn", "$fn.o" if -e "$fn";
 
 	my $count = 0;
 	my $err = 0;
@@ -455,7 +456,7 @@ BEGIN {
 	
 	# try to detect a lockfile (this isn't atomic but 
 	# should do for now
-	$lockfn = "$root/local/cluster.lck";       # lock file name
+	$lockfn = "$root/local_data/cluster.lck";       # lock file name
 	if (-e $lockfn) {
 		open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
 		my $pid = <CLLOCK>;
@@ -467,7 +468,7 @@ BEGIN {
 
 package DXUser;
 
-use DXVars;
+use SysVar;
 use DXUser;
 
 if (@ARGV) {
@@ -475,8 +476,8 @@ if (@ARGV) {
 	print "user filename now $userfn\n";
 }
 
-DXUser->del_file($main::userfn);
-DXUser->init($main::userfn, 1);
+DXUser::del_file();
+DXUser::init();
 %u = ();
 my $count = 0;
 my $err = 0;
@@ -492,7 +493,7 @@ while (<DATA>) {
 		$err++
 	}
 }
-DXUser->sync; DXUser->finish;
+DXUser::sync; DXUser::finish;
 print "There are $count user records and $err errors\n";
 };
 		print $fh "__DATA__\n";