From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 23 Mar 2016 08:08:49 +0000 (+0100)
Subject: dsa-check-zone-rrsig-expiration-many: stop waiting for the timeout after the last... 
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-nagios.git;a=commitdiff_plain;h=3756e9519c4d13cdc6757d4329667481d12d6732

dsa-check-zone-rrsig-expiration-many: stop waiting for the timeout after the last zone checker finished
---

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 5d9342f..cfbacfd 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;
+	# print STDERR "foo #threads:", (scalar keys %threads), ":", join(",", keys %threads),"\n";
+	last if scalar keys %threads == 0;
+	sleep 1;
 }
 for my $zone (sort {$a cmp $b} keys %threads) {
 	push @{$count->{'warn'}}, $zone;
diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index dac13c9..8dc60e7 100644
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -19,6 +19,8 @@ dsa-nagios-checks (108+XXXX) UNRELEASED; urgency=medium
   * dsa-check-raid-3ware: modernize
   * dsa-check-zone-rrsig-expiration-many: actually exit non-zero if there were
     warnings.
+  * dsa-check-zone-rrsig-expiration-many: stop waiting for the timeout after
+    the last zone checker finished.
 
   [ Tollef Fog Heen ]
   * dsa-update-unowned-file-status: ignore fdescfs, used for /dev/fd on
@@ -31,7 +33,7 @@ dsa-nagios-checks (108+XXXX) UNRELEASED; urgency=medium
   * Add dsa-check-hpssacli, replaces hpacucli for new hosts.
   * dsa-check-hpssacli: accept 12.0Gbps as transfer speed for SAS
 
- -- Peter Palfrader <weasel@debian.org>  Wed, 23 Mar 2016 08:55:04 +0100
+ -- Peter Palfrader <weasel@debian.org>  Wed, 23 Mar 2016 09:08:38 +0100
 
 dsa-nagios-checks (108) unstable; urgency=medium