Imported Upstream version 1.4.16_pre1

This commit is contained in:
Jan Wagner 2013-11-26 23:58:53 +01:00
parent 047baae1ca
commit 212b4b8677
69 changed files with 10803 additions and 2698 deletions

View file

@ -71,7 +71,8 @@ while(defined $nextdev){
} elsif (/^($nextdev)\s*:/) {
$device=$1;
$devices{$device}=$device;
if (/active/) {
if (/\sactive/) {
$status{$device} = ''; # Shall be filled later if available
$active{$device} = 1;
}
}
@ -80,7 +81,11 @@ while(defined $nextdev){
}
foreach my $k (sort keys %devices){
if ($status{$k} =~ /_/) {
if (!exists($status{$k})) {
$msg .= sprintf " %s inactive with no status information.",
$devices{$k};
$code = max_state($code, "CRITICAL");
} elsif ($status{$k} =~ /_/) {
if (defined $recovery{$k}) {
$msg .= sprintf " %s status=%s, recovery=%s, finish=%s.",
$devices{$k}, $status{$k}, $recovery{$k}, $finish{$k};
@ -94,10 +99,11 @@ foreach my $k (sort keys %devices){
$code = max_state($code, "OK");
} else {
if ($active{$k}) {
$msg .= sprintf " %s active with no status information.\n",
$msg .= sprintf " %s active with no status information.",
$devices{$k};
$code = max_state($code, "OK");
} else {
# This should't run anymore, but is left as a catch-all
$msg .= sprintf " %s does not exist.\n", $devices{$k};
$code = max_state($code, "CRITICAL");
}