diff --git a/Check.pm b/Check.pm index 9efe4ac..41349c6 100644 --- a/Check.pm +++ b/Check.pm @@ -77,6 +77,7 @@ sub action } else { $lastAge = sprintf("%.1f", (time - $lastAge) / (24 * 3600)); } + # Color for age if ( $lastAge < 1.1 ) { $lastAgeColor = "MediumSeaGreen"; @@ -108,34 +109,32 @@ sub action $lastAgeColor = "Tomato"; } - $reasonHilite = $Conf{CgiStatusHilightColor}{$Status{$host}{reason}} || $Conf{CgiStatusHilightColor}{$Status{$host}{state}}; - -# If Backup is disable -if ( $Conf{BackupsDisable} == 1 ) { - if ( $Status{$host}{state} ne "Status_backup_in_progress" && $Status{$host}{state} ne "Status_restore_in_progress" ) { - $reasonHilite = $Conf{CgiStatusHilightColor}{Disabled_OnlyManualBackups}; - $tempState = "Disabled_OnlyManualBackups"; - $tempReason = ""; - } else { - $tempState = $Status{$host}{state}; - $tempReason = $Status{$host}{reason}; - } -} elsif ($Conf{BackupsDisable} == 2 ) { - $reasonHilite = $Conf{CgiStatusHilightColor}{Disabled_AllBackupsDisabled}; - $tempState = "Disabled_AllBackupsDisabled"; - $tempReason = ""; -} else { - $tempState = $Status{$host}{state}; - $tempReason = $Status{$host}{reason}; -} -$reasonHilite = " bgcolor=\"$reasonHilite\"" if ( $reasonHilite ne "" ); - if ( $tempState ne "Status_backup_in_progress" - && $tempState ne "Status_restore_in_progress" - && $Conf{BackupsDisable} == 0 - && $Status{$host}{error} ne "" ) { - ($shortErr = $Status{$host}{error}) =~ s/(.{48}).*/$1.../; - $shortErr = " ($shortErr)"; - } + $reasonHilite = $Conf{CgiStatusHilightColor}{$Status{$host}{reason}} || $Conf{CgiStatusHilightColor}{$Status{$host}{state}}; + + # If Backup is disable + if ( $Conf{BackupsDisable} == 1 ) { + if ( $Status{$host}{state} ne "Status_backup_in_progress" && $Status{$host}{state} ne "Status_restore_in_progress" ) { + $reasonHilite = $Conf{CgiStatusHilightColor}{Disabled_OnlyManualBackups}; + $tempState = "Disabled_OnlyManualBackups"; + $tempReason = ""; + } else { + $tempState = $Status{$host}{state}; + $tempReason = $Status{$host}{reason}; + } + } elsif ($Conf{BackupsDisable} == 2 ) { + $reasonHilite = $Conf{CgiStatusHilightColor}{Disabled_AllBackupsDisabled}; + $tempState = "Disabled_AllBackupsDisabled"; + $tempReason = ""; + } else { + $tempState = $Status{$host}{state}; + $tempReason = $Status{$host}{reason}; + } + + $reasonHilite = " bgcolor=\"$reasonHilite\"" if ( $reasonHilite ne "" ); + if ( $tempState ne "Status_backup_in_progress" && $tempState ne "Status_restore_in_progress" && $Conf{BackupsDisable} == 0 && $Status{$host}{error} ne "" ) { + ($shortErr = $Status{$host}{error}) =~ s/(.{48}).*/$1.../; + $shortErr = " ($shortErr)"; + } # Check Size Consistency my $bpc = BackupPC::Lib->new();