some gratuitous whitespace changes, and a fix to the "recovery =" detection

logic in check_linux_raid.pl


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1418 f882894a-f735-0410-b71e-b25c423dba1c

1 files changed, 9 insertions, 11 deletions

diff --git a/contrib/check_linux_raid.pl b/contrib/check_linux_raid.pl
index 85d5dc4..11bc3cd 100644
--- a/contrib/check_linux_raid.pl
+++ b/contrib/check_linux_raid.pl
@@ -20,7 +20,7 @@
 #
 # Usage:   check_raid [raid-name]
 # Example: check_raid md0
-#          WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
+#         WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
 
 use strict;
 use lib utils.pm;
@@ -61,19 +61,17 @@ while(defined $nextdev){
                 if (defined $device) {
                         if (/(\[[_U]+\])/) {
                                 $status{$device} = $1;
-                                $device = undef;
                         } elsif (/recovery = (.*?)\s/) {  
                                 $recovery{$device} = $1;
                                 ($finish{$device}) = /finish=(.*?min)/;
-                                $device = undef;
+                        } elsif (/^\s*$/) {
+                                $device=undef;
                         }
-                } else {
-                        if (/^($nextdev)\s*:/) {
-                                $device=$1;
-                                $devices{$device}=$device;
-                                if (/active/) {
-                                        $active{$device} = 1;
-                                }
+                } elsif (/^($nextdev)\s*:/) {
+                        $device=$1;
+                        $devices{$device}=$device;
+                        if (/active/) {
+                                $active{$device} = 1;
                         }
                 }
         }
@@ -82,7 +80,7 @@ while(defined $nextdev){
 
 foreach my $k (sort keys %devices){
         if ($status{$k} =~ /_/) {
-                if ($recovery{$k}) {
+                if (defined $recovery{$k}) {
                         $msg .= sprintf " %s status=%s, recovery=%s, finish=%s.",
                                 $devices{$k}, $status{$k}, $recovery{$k}, $finish{$k};
                         $code = max_state($code, "WARNING");