Improve line splitting for CV status

Fix regex for state checking
This commit is contained in:
Georg Schönberger
2013-10-25 16:58:27 +02:00
parent 839ae0db0c
commit cf0246a028

View File

@@ -770,18 +770,18 @@ sub getCVStatus {
if(defined($currBlock)){
$line =~ s/^\s+|\s+$//g;#trim line
if($currBlock eq 'Cachevault_Info' && $line =~ /^State/){
$line =~ /([a-zA-Z0-9]*)$/;
if($1 ne "Optimal") {
my @vals = split('\s{2,}',$line);
if($vals[1] ne "Optimal") {
$status = getExitState($status, STATE_WARNING);
if($VERBOSITY == 0){$statusMessage .= "CV state not optimal, ";}
if($VERBOSITY >= 1){$statusMessage .= "CV Cachevault_Info state $1, "; }
if($VERBOSITY == 0){$statusMessage .= "CacheVault state not optimal, ";}
if($VERBOSITY >= 1){$statusMessage .= "Cachevault Info state $1, "; }
}
}
elsif($currBlock eq 'Firmware_Status' && $line =~ /^Replacement required/){
$line =~ /([a-zA-Z0-9]*)$/;
if($1 ne "No") {
$status = getExitState($status, STATE_WARNING);
$statusMessage .= "CV replacement required, ";
$statusMessage .= "CacheVault replacement required, ";
}
}
}