X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-zone-rrsig-expiration-many;h=4139b0da2e4261966e2efa2190544f23a1cedd69;hb=90b9a1d5360d73feebc844d67a8793b89c977e3d;hp=b97cb09fdb653e6af840749eb68b42b843f3df10;hpb=2e0c04d4e9ecd89ae6470e76feb9db5601e9c21a;p=mirror%2Fdsa-nagios.git diff --git a/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many b/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many index b97cb09..4139b0d 100755 --- a/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many +++ b/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many @@ -177,7 +177,9 @@ while (time - $begin <= $params->{timeout}) { else { push @{$count->{'unknown'}}, $zone; }; delete $threads{$zone}; } - sleep(1) unless scalar keys %threads == 0; + last if scalar keys %threads == 0; + print STDERR (scalar keys %threads), " threads left: ", join(" ", keys %threads), "\n" if $params->{'debug'}; + sleep 1; } for my $zone (sort {$a cmp $b} keys %threads) { push @{$count->{'warn'}}, $zone; @@ -189,7 +191,7 @@ for my $k (keys %$count) { @{$count->{$k}} = sort {$a cmp $b} @{$count->{$k}}; } -my $exit = 0; +my $exit; my %state_mapping = ( 'unknown' => 255, 'critical' => 2, @@ -209,4 +211,4 @@ for my $state (sort {$state_mapping{$b} <=> $state_mapping{$a}} keys %state_mapp printf "unsigned: %d", scalar @{$count->{'unsigned'}}; print "\n"; print $_ for (@details); -exit $exit; +exit ((defined $exit) ? $exit : 0);