add better errors in DXUser::Exportusers

[spider.git] / perl / DXUser.pm

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 02ed86cd002949b5d94c8f74def12ccd1e8d3db9..f78c8120181bfd39889e4be48a7b90ca60c4e9c6 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -30,7 +30,7 @@ $dbm = undef;
 $filename = undef;
 $lastoperinterval = 60*24*60*60;
 $lasttime = 0;
-$lrusize = 3000;
+$lrusize = 10000;
 $tooold = 86400 * 365;         # this marks an old user who hasn't given enough info to be useful
 $v3 = 0;
 our $maxconnlist = 3;                  # remember this many connection time (duration) [start, end] pairs
@@ -49,6 +49,7 @@ my $json;
                  email => '0,E-mail Address,parray',
                  priv => '9,Privilege Level',
                  lastin => '0,Last Time in,cldatetime',
+                 lastseen => '0,Last Seen,cldatetime',
                  passwd => '9,Password,yesno',
                  passphrase => '9,Pass Phrase,yesno',
                  addr => '0,Full Address',
@@ -179,6 +180,7 @@ sub process
 
 sub finish
 {
+       $dbm->sync;
        undef $dbm;
        untie %u;
 }
@@ -204,6 +206,7 @@ sub new
 #      confess "can't create existing call $call in User\n!" if $u{$call};
 
        my $self = $pkg->alloc($call);
+       $self->{lastseen} = $main::systime;
        $self->put;
        return $self;
 }
@@ -220,7 +223,10 @@ sub get
        
        # is it in the LRU cache?
        my $ref = $lru->get($call);
-       return $ref if $ref && ref $ref eq 'DXUser';
+       if ($ref && ref $ref eq 'DXUser') {
+               $ref->{lastseen} = $main::systime;
+               return $ref;
+       }
        
        # search for it
        unless ($dbm->get($call, $data)) {
@@ -240,6 +246,7 @@ sub get
                        }
                        return undef;
                }
+               $ref->{lastseen} = $main::systime;
                $lru->put($call, $ref);
                return $ref;
        }
@@ -316,9 +323,15 @@ sub encode
 {
     my $ref = shift;
     unbless($ref);
-    my $s = $json->encode($ref);
-    bless $ref, 'DXUser';
-    return $s;
+    my $s;
+       
+       eval {$s = $json->encode($ref) };
+       if ($s && !$@) {
+               bless $ref, 'DXUser';
+               return $s;
+       } else {
+               LogDbg('DXUser', "DXUser::json_encode $ref->{call}, $@");
+       }
 }
 
 
@@ -343,7 +356,7 @@ sub close
        my $self = shift;
        my $startt = shift;
        my $ip = shift;
-       $self->{lastin} = $main::systime;
+       $self->{lastseen} = $self->{lastin} = $main::systime;
        # add a record to the connect list
        my $ref = [$startt || $self->{startt}, $main::systime];
        push @$ref, $ip if $ip;
@@ -475,9 +488,9 @@ print "There are $count user records and $err errors in $diff mS\n";
                                my $ekey = $key;
                                $eval =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; 
                                $ekey =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg; 
-                               LogDbg('DXCommand', "Export Error1: $ekey\t$eval");
+                               LogDbg('DXCommand', "Export Error1: invalid callsign($ekey) => '$eval'");
                                eval {$dbm->del($key)};
-                               dbg(carp("Export Error1: $ekey\t$eval\n$@")) if $@;
+                               dbg(carp("Export Error1: delete call $ekey => '$eval' $@")) if $@;
                                ++$err;
                                next;
                        }
@@ -488,7 +501,7 @@ print "There are $count user records and $err errors in $diff mS\n";
                                if ($ref->is_user && !$ref->{priv} && $main::systime > $t + $tooold) {
                                        unless ($ref->{lat} && $ref->{long} || $ref->{qth} || $ref->{qra}) {
                                                eval {$dbm->del($key)};
-                                               dbg(carp("Export Error2: $key\t$val\n$@")) if $@;
+                                               dbg(carp("Export Error2: delete $key => '$val' $@")) if $@;
                                                LogDbg('DXCommand', "$ref->{call} deleted, too old");
                                                $del++;
                                                next;