projects
/
mirror
/
dsa-nagios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
postgresql 8.4 for dak and dak-dev clusters on ries
[mirror/dsa-nagios.git]
/
dsa-nagios-checks
/
checks
/
dsa-check-raid-mpt
diff --git
a/dsa-nagios-checks/checks/dsa-check-raid-mpt
b/dsa-nagios-checks/checks/dsa-check-raid-mpt
index
f4f3407
..
3599c5e
100755
(executable)
--- a/
dsa-nagios-checks/checks/dsa-check-raid-mpt
+++ b/
dsa-nagios-checks/checks/dsa-check-raid-mpt
@@
-36,17
+36,15
@@
my $command = "sudo $MPT_STATUS -s";
open (MPT, "$command|") or die ("Cannot run $command: $!\n");
my @tw=<MPT>;
close MPT;
open (MPT, "$command|") or die ("Cannot run $command: $!\n");
my @tw=<MPT>;
close MPT;
-if ($CHILD_ERROR) { # program failed
- die("$command returned with non-zero exit code: ".($CHILD_ERROR / 256)."\n");
-};
+my $command_exitcode = $CHILD_ERROR;
my $exit = $UNKNOWN;
my $msg = '';
for my $line (@tw) {
chomp $line;
next if $line =~ /^$/;
my $exit = $UNKNOWN;
my $msg = '';
for my $line (@tw) {
chomp $line;
next if $line =~ /^$/;
- my ($device, $num, $status) = $line =~ m
#^(log_id|vol_id|phys_id)\s+([0-9]+)\s+(.*)$#
;
+ my ($device, $num, $status) = $line =~ m
/^(log_id|vol_id|phys_id)\s+([0-9]+)\s+(.*)$/
;
unless (defined($device) && defined($num) && defined($status)) {
print "Cannot parse line '$line'\n";
exit $UNKNOWN;
unless (defined($device) && defined($num) && defined($status)) {
print "Cannot parse line '$line'\n";
exit $UNKNOWN;
@@
-66,5
+64,10
@@
if ($msg eq '') {
die ("exit is not UNKNOWN but $exit") if ($exit != $UNKNOWN);
}
die ("exit is not UNKNOWN but $exit") if ($exit != $UNKNOWN);
}
+if ($command_exitcode && ($exit == $OK || $exit == $UNKNOWN)) {
+ $exit = $UNKNOWN;
+ $msg .= ($msg eq '' ? '' : '; '). "$command returned with non-zero exit code: ".($command_exitcode / 256);
+}
+
print $msg,"\n";
exit $exit;
print $msg,"\n";
exit $exit;