projects
/
irspy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Invoke Search::Bath
[irspy-moved-to-github.git]
/
lib
/
ZOOM
/
IRSpy.pm
diff --git
a/lib/ZOOM/IRSpy.pm
b/lib/ZOOM/IRSpy.pm
index
dcba350
..
4e2040c
100644
(file)
--- a/
lib/ZOOM/IRSpy.pm
+++ b/
lib/ZOOM/IRSpy.pm
@@
-435,8
+435,6
@@
sub check {
my $timeout = $this->{timeout};
$this->log("irspy", "beginnning with test '$topname' (timeout $timeout)");
my $timeout = $this->{timeout};
$this->log("irspy", "beginnning with test '$topname' (timeout $timeout)");
- $timeout = 2;
-
my $nskipped = 0;
my @conn = @{ $this->{connections} };
my $nskipped = 0;
my @conn = @{ $this->{connections} };
@@
-446,13
+444,11
@@
sub check {
my @copy_conn = @conn; # avoid alias problems after splice()
my $nconn = scalar(@copy_conn);
my @copy_conn = @conn; # avoid alias problems after splice()
my $nconn = scalar(@copy_conn);
-
foreach my $i0 (0 .. $#copy_conn) {
my $conn = $copy_conn[$i0];
foreach my $i0 (0 .. $#copy_conn) {
my $conn = $copy_conn[$i0];
- #warn Dumper($conn);
-
#print "connection $i0 of $nconn/", scalar(@conn), " is $conn\n";
next if !defined $conn;
#print "connection $i0 of $nconn/", scalar(@conn), " is $conn\n";
next if !defined $conn;
+
if (!$conn->current_task()) {
if (!$conn->next_task()) {
# Out of tasks: we need a new test
if (!$conn->current_task()) {
if (!$conn->next_task()) {
# Out of tasks: we need a new test
@@
-465,11
+461,13
@@
sub check {
$conn->log("irspy_test",
"checking for next test after '$address'");
$nextaddr = $this->_next_test($address);
$conn->log("irspy_test",
"checking for next test after '$address'");
$nextaddr = $this->_next_test($address);
- if ($nextaddr && $conn->record->zoom_error->{TIMEOUT} >= $max_timeout_errors) {
- $conn->log("irspy", "Got to many timeouts, stop testing: " . $conn->record->zoom_error->{TIMEOUT});
- $nextaddr = "";
- }
}
}
+
+ if (ZOOM::IRSpy::Test::zoom_error_timeout_check($conn)) {
+ $conn->log("irspy", "Got to many timeouts, stop testing");
+ undef $nextaddr;
+ }
+
if (!defined $nextaddr) {
$conn->log("irspy", "has no more tests: removing");
$this->_rewrite_irspy_record($conn);
if (!defined $nextaddr) {
$conn->log("irspy", "has no more tests: removing");
$this->_rewrite_irspy_record($conn);
@@
-511,6
+509,13
@@
sub check {
my $task = $conn->next_task();
die "no next task queued for $conn" if !defined $task;
my $task = $conn->next_task();
die "no next task queued for $conn" if !defined $task;
+
+ # do not run the next task if we got too many timeouts
+ if (ZOOM::IRSpy::Test::zoom_error_timeout_check($conn)) {
+ $conn->log("irspy_task", "Got to many timeouts for this target, do not start a new task");
+ next;
+ }
+
$conn->log("irspy_task", "preparing task $task");
$conn->next_task(0);
$conn->current_task($task);
$conn->log("irspy_task", "preparing task $task");
$conn->next_task(0);
$conn->current_task($task);