X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXUser.pm;h=85a22195f9a08de314cf0389b194cb273d4db51c;hb=c87f5c87d207de16008d38561a7bc547a10ea62b;hp=ee24c5d4a3f4b0ea76c55991a71e63a107a1bb81;hpb=ff93c84f70d94087bfa178889b8dbbd465919f53;p=spider.git

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index ee24c5d4..85a22195 100644
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -474,7 +474,10 @@ sub close
 	my $ip = shift;
 	$self->{lastin} = $main::systime;
 	# add a record to the connect list
-#	$self->put();
+	my $ref = [$startt || $self->{startt}, $main::systime];
+	push @$ref, $ip if $ip;
+	push @{$self->{connlist}}, $ref;
+	shift @{$self->{connlist}} if @{$self->{connlist}} > $maxconnlist;
 }
 
 #
@@ -897,10 +900,13 @@ sub readinjson
 		move($nfn, $fn);
 	};
 
-	# if we don't have a users.v4 at this point, look for a backup users.v4.o
+	# if we don't have a users.v4 at this point, look for a backup users.v4.json, users.v4.n then users.v4.o
 	unless (-e $fn) {
-		move($ofn, $fn);
+		move($nfn, $fn) unless -e $fn; 	# the users.v4 isn't there (maybe convert-users-v3-to-v4.pl
+		move("$fn.json", $fn);			# from a run of convert-users-v3-to-v4.pl
+		move($ofn, $fn) unless -e $fn;	# desperate now...
 	}
+	
 	if ($ifh) {
 		$ifh->seek(0, 0);
 	} else {