projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
increase rbn connection startup delay
[spider.git]
/
perl
/
RBN.pm
diff --git
a/perl/RBN.pm
b/perl/RBN.pm
index 5e6a8a6486a584b259756143bccda67788d0975c..aac6fa90da9246f9ec04fa75bb95b61f45999c77 100644
(file)
--- a/
perl/RBN.pm
+++ b/
perl/RBN.pm
@@
-22,9
+22,9
@@
use Time::HiRes qw(clock_gettime CLOCK_REALTIME);
our @ISA = qw(DXChannel);
our @ISA = qw(DXChannel);
-our $startup_delay =
0;#3*60;
# don't send anything out until this timer has expired
+our $startup_delay =
10*60;
# don't send anything out until this timer has expired
# this is to allow the feed to "warm up" with duplicates
# this is to allow the feed to "warm up" with duplicates
- # so that the "big rush" doesn't happen.
+ # so that the "big rush" doesn't happen.
our $minspottime = 60*60; # the time between respots of a callsign - if a call is
# still being spotted (on the same freq) and it has been
our $minspottime = 60*60; # the time between respots of a callsign - if a call is
# still being spotted (on the same freq) and it has been
@@
-211,19
+211,25
@@
sub normal
# do we have it?
my $spot = $spots->{$sp};
# do we have it?
my $spot = $spots->{$sp};
- $spot = $spots->{$spp} if !$spot && exists $spots->{$spp};
- $spot = $spots->{$spm} if !$spot && exists $spots->{$spm};
+ $spot = $spots->{$spp}
, $sp = $spp, dbg('SPP')
if !$spot && exists $spots->{$spp};
+ $spot = $spots->{$spm}
, $sp = $spm, dbg('SPM')
if !$spot && exists $spots->{$spm};
# if we have one and there is only one slot and that slot's time isn't expired for respot then return
my $respot = 0;
# if we have one and there is only one slot and that slot's time isn't expired for respot then return
my $respot = 0;
- if ($spot && @$spot == 1) {
- unless ($self->{minspottime} > 0 && $tim - $spot->[0] >= $self->{minspottime}) {
- dbg("RBN: key: '$sp' call: $call qrg: $qrg DUPE \@ ". atime(int $spot->[0])) if isdbg('rbn');
- return;
+ if ($spot && ref $spot) {
+ if (@$spot == 1) {
+ unless ($self->{minspottime} > 0 && $tim - $spot->[0] >= $self->{minspottime}) {
+ dbg("RBN: key: '$sp' call: $call qrg: $qrg DUPE \@ ". atime(int $spot->[0])) if isdbg('rbn');
+ return;
+ }
+
+ dbg("RBN: key: '$sp' RESPOTTING call: $call qrg: $qrg last seen \@ ". atime(int $spot->[0])) if isdbg('rbn');
+ ++$respot;
}
}
- dbg("RBN: key: '$sp' RESPOTTING call: $call qrg: $qrg last seen \@ ". atime(int $spot->[0])) if isdbg('rbn');
- ++$respot;
+ } elsif ($spot) {
+ dbg("RBN: key '$sp' = '$spot' not ref");
+ return;
}
# here we either have an existing spot record buildup on the go, or we need to create the first one
}
# here we either have an existing spot record buildup on the go, or we need to create the first one
@@
-235,7
+241,7
@@
sub normal
# add me to the display queue unless we are waiting for initial in rush to finish
return unless $self->{inrushpreventor} < $main::systime;
# add me to the display queue unless we are waiting for initial in rush to finish
return unless $self->{inrushpreventor} < $main::systime;
- push @
queue
, $sp if @$spot == 1; # queue the KEY (not the record)
+ push @
{$self->{queue}}
, $sp if @$spot == 1; # queue the KEY (not the record)
# build up a new record and store it in the buildup
# deal with the unix time
# build up a new record and store it in the buildup
# deal with the unix time
@@
-244,7
+250,7
@@
sub normal
$utz -= 86400 if $utz > $tim+3600; # too far ahead, drag it back one day
# create record and add into the buildup
$utz -= 86400 if $utz > $tim+3600; # too far ahead, drag it back one day
# create record and add into the buildup
- my $r = [$origin, nearest(.1, $qrg), $call, $mode, $s, $t, $utz, $respot];
+ my $r = [$origin, nearest(.1, $qrg), $call, $mode, $s, $t, $utz, $respot
, $u
];
dbg("RBN: key: '$sp' ADD RECORD call: $call qrg: $qrg origin: $origin") if isdbg('rbn');
push @$spot, $r;
dbg("RBN: key: '$sp' ADD RECORD call: $call qrg: $qrg origin: $origin") if isdbg('rbn');
push @$spot, $r;
@@
-253,13
+259,17
@@
sub normal
my $now = clock_gettime(CLOCK_REALTIME);
# now run the waiting queue which just contains KEYS ($call|$qrg)
my $now = clock_gettime(CLOCK_REALTIME);
# now run the waiting queue which just contains KEYS ($call|$qrg)
- foreach $sp (@
queue
) {
+ foreach $sp (@
{$self->{queue}}
) {
my $cand = $spots->{$sp};
my $cand = $spots->{$sp};
- if ($now >= $cand->[0]+$dwelltime ) {
+ unless ($cand && $cand->[0]) {
+ dbg "RBN Cand " . ($cand ? 'def' : 'undef') . " [0] " . ($cand->[0] ? 'def' : 'undef') . " dwell $dwelltime";
+ next;
+ }
+ if ($now >= $cand->[0] + $dwelltime ) {
# we have a candidate, create qualitee value(s);
unless (@$cand > 1) {
dbg "RBN: QUEUE key '$sp' MISSING RECORDS " . dd($cand) if isdbg 'rbn';
# we have a candidate, create qualitee value(s);
unless (@$cand > 1) {
dbg "RBN: QUEUE key '$sp' MISSING RECORDS " . dd($cand) if isdbg 'rbn';
- shift @
queue
;
+ shift @
{$self->{queue}}
;
next;
}
my $savedtime = shift @$cand; # save the start time
next;
}
my $savedtime = shift @$cand; # save the start time
@@
-279,7
+289,7
@@
sub normal
dbg "RBN: QUEUE key '$sp' cleared" if isdbg 'rbn';
$spots->{$sp} = [$savedtime];
dbg "RBN: QUEUE key '$sp' cleared" if isdbg 'rbn';
$spots->{$sp} = [$savedtime];
- shift @
queue
;
+ shift @
{$self->{queue}}
;
} else {
dbg sprintf("RBN: QUEUE key: '$sp' SEND time not yet reached %.1f secs left", $spot->[0] + $dwelltime - $now) if isdbg 'rbnqueue';
}
} else {
dbg sprintf("RBN: QUEUE key: '$sp' SEND time not yet reached %.1f secs left", $spot->[0] + $dwelltime - $now) if isdbg 'rbnqueue';
}
@@
-366,7
+376,7
@@
sub dx_spot
foreach my $r (@$spot) {
foreach my $r (@$spot) {
- # $r = [$origin, $qrg, $call, $mode, $s, $t, $utz, $respot];
+ # $r = [$origin, $qrg, $call, $mode, $s, $t, $utz, $respot
, $qra
];
# Spot::prepare($qrg, $call, $utz, $comment, $origin);
my $comment = sprintf "%-3s %2ddB $quality", $r->[3], $r->[4];
# Spot::prepare($qrg, $call, $utz, $comment, $origin);
my $comment = sprintf "%-3s %2ddB $quality", $r->[3], $r->[4];
@@
-422,6
+432,12
@@
sub dx_spot
}
$buf =~ s/^DX/RB/;
$dxchan->local_send('N', $buf);
}
$buf =~ s/^DX/RB/;
$dxchan->local_send('N', $buf);
+
+ if ($saver->[8] && is_qra($saver->[8])) {
+ my $user = DXUser::get_current($s[1]) || DXUser::new($s[1]);
+ $user->qra($saver->[8]) unless $user->qra;
+ $user->lastseen($main::systime);
+ }
}
}
}
}