projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add HAProxy type 1 "real ip" address changes
[spider.git]
/
perl
/
DXUser.pm
diff --git
a/perl/DXUser.pm
b/perl/DXUser.pm
index 454432d190ca368523e4f8b37ae69790c1220a18..bfc06b75801d34fb22348dd5b0860785175ca174 100644
(file)
--- a/
perl/DXUser.pm
+++ b/
perl/DXUser.pm
@@
-20,6
+20,7
@@
use File::Copy;
use Data::Structure::Util qw(unbless);
use Time::HiRes qw(gettimeofday tv_interval);
use IO::File;
use Data::Structure::Util qw(unbless);
use Time::HiRes qw(gettimeofday tv_interval);
use IO::File;
+use JSON;
use strict;
use strict;
@@
-106,6
+107,7
@@
my $json;
maxconnect => '1,Max Connections',
startt => '0,Start Time,cldatetime',
connlist => '1,Connections,parraydifft',
maxconnect => '1,Max Connections',
startt => '0,Start Time,cldatetime',
connlist => '1,Connections,parraydifft',
+ width => '0,Preferred Width',
);
#no strict;
);
#no strict;
@@
-323,9
+325,15
@@
sub encode
{
my $ref = shift;
unbless($ref);
{
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}, $@");
+ }
}
}
@@
-481,10
+489,10
@@
print "There are $count user records and $err errors in $diff mS\n";
my $eval = $val;
my $ekey = $key;
$eval =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg;
my $eval = $val;
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
");
+ $ekey =~ s/([\%\x00-\x1f\x7f-\xff])/sprintf("%%%02X", ord($1))/eg;
+ LogDbg('DXCommand', "Export Error1:
invalid call '$key' => '$val'
");
eval {$dbm->del($key)};
eval {$dbm->del($key)};
-
dbg(carp("Export Error1: $ekey\t$eval\n
$@")) if $@;
+
dbg(carp("Export Error1: delete $key => '$val'
$@")) if $@;
++$err;
next;
}
++$err;
next;
}
@@
-495,7
+503,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)};
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;
LogDbg('DXCommand', "$ref->{call} deleted, too old");
$del++;
next;
@@
-505,9
+513,9
@@
print "There are $count user records and $err errors in $diff mS\n";
print $fh "$key\t" . encode($ref) . "\n";
++$count;
} else {
print $fh "$key\t" . encode($ref) . "\n";
++$count;
} else {
- LogDbg('DXCommand', "Export Error3:
$key
\t" . carp($val) ."\n$@");
+ LogDbg('DXCommand', "Export Error3:
'$key'
\t" . carp($val) ."\n$@");
eval {$dbm->del($key)};
eval {$dbm->del($key)};
- dbg(carp("Export Error3:
$key\t$val\n
$@")) if $@;
+ dbg(carp("Export Error3:
delete '$key' => '$val'
$@")) if $@;
++$err;
}
}
++$err;
}
}
@@
-670,7
+678,7
@@
sub wanttalk
sub wantgrid
{
sub wantgrid
{
- return _want('grid', @_);
+ return _want
not
('grid', @_);
}
sub wantemail
}
sub wantemail
@@
-705,12
+713,12
@@
sub wantusstate
sub wantdxcq
{
sub wantdxcq
{
- return _want('dxcq', @_);
+ return _want
not
('dxcq', @_);
}
sub wantdxitu
{
}
sub wantdxitu
{
- return _want('dxitu', @_);
+ return _want
not
('dxitu', @_);
}
sub wantgtk
}
sub wantgtk