X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FHostInfo.pm;h=a49eb79fd6d10ebc831741fc606c98e59714294b;hp=81d75a3147be1c7e0b59559b79697a77354bb4ad;hb=a7e968ce327855f2ba2624ca8517069a936c9b5b;hpb=5729095faa3ef12dc5d4f02538c3650ac81912ef diff --git a/lib/BackupPC/CGI/HostInfo.pm b/lib/BackupPC/CGI/HostInfo.pm index 81d75a3..a49eb79 100644 --- a/lib/BackupPC/CGI/HostInfo.pm +++ b/lib/BackupPC/CGI/HostInfo.pm @@ -76,6 +76,50 @@ sub action } ReadUserEmailInfo(); + if ($Conf{XferMethod} eq "archive" ) { + my @Archives = $bpc->ArchiveInfoRead($host); + my ($ArchiveStr,$warnStr); + + for ( my $i = 0 ; $i < @Archives ; $i++ ) { + my $startTime = timeStamp2($Archives[$i]{startTime}); + my $dur = $Archives[$i]{endTime} - $Archives[$i]{startTime}; + $dur = 1 if ( $dur <= 0 ); + my $duration = sprintf("%.1f", $dur / 60); + my $Archives_Result = $Lang->{failed}; + if ($Archives[$i]{result} ne "failed") { $Archives_Result = $Lang->{success}; } + $ArchiveStr .= <$Archives[$i]{num} + $Archives_Result + $startTime + $duration + +EOF + } + if ( $ArchiveStr ne "" ) { + $ArchiveStr = eval("qq{$Lang->{Archive_Summary}}"); + } + if ( @Archives == 0 ) { + $warnStr = $Lang->{There_have_been_no_archives}; + } + if ( $StatusHost{BgQueueOn} ) { + $statusStr .= eval("qq{$Lang->{Host_host_is_queued_on_the_background_queue_will_be_backed_up_soon}}"); + } + if ( $StatusHost{UserQueueOn} ) { + $statusStr .= eval("qq{$Lang->{Host_host_is_queued_on_the_user_queue__will_be_backed_up_soon}}"); + } + if ( $StatusHost{CmdQueueOn} ) { + $statusStr .= eval("qq{$Lang->{A_command_for_host_is_on_the_command_queue_will_run_soon}}"); + } + + my $content = eval("qq{$Lang->{Host__host_Archive_Summary2}}"); + Header(eval("qq{$Lang->{Host__host_Archive_Summary}}"), $content); + Trailer(); + return; + } + + # + # Normal, non-archive case + # my @Backups = $bpc->BackupInfoRead($host); my($str, $sizeStr, $compStr, $errStr, $warnStr); for ( my $i = 0 ; $i < @Backups ; $i++ ) { @@ -105,52 +149,52 @@ sub action my $filled = $Backups[$i]{noFill} ? $Lang->{No} : $Lang->{Yes}; $filled .= " ($Backups[$i]{fillFromNum}) " if ( $Backups[$i]{fillFromNum} ne "" ); - my $ltype = $Lang->{"backupType_$Backups[$i]{type}"}; + my $ltype = $Lang->{"backupType_$Backups[$i]{type}"}; $str .= < $Backups[$i]{num} - $ltype - $filled - $startTime - $duration - $age - $TopDir/pc/$host/$Backups[$i]{num} + $Backups[$i]{num} + $ltype + $filled + $startTime + $duration + $age + $TopDir/pc/$host/$Backups[$i]{num} EOF $sizeStr .= < $Backups[$i]{num} - $ltype - $Backups[$i]{nFiles} - $MB - $MBperSec - $Backups[$i]{nFilesExist} - $MBExist - $Backups[$i]{nFilesNew} - $MBNew + $Backups[$i]{num} + $ltype + $Backups[$i]{nFiles} + $MB + $MBperSec + $Backups[$i]{nFilesExist} + $MBExist + $Backups[$i]{nFilesNew} + $MBNew EOF - my $is_compress = $Backups[$i]{compress} || $Lang->{off}; - if (! $ExistComp) { $ExistComp = " "; } - if (! $MBExistComp) { $MBExistComp = " "; } + my $is_compress = $Backups[$i]{compress} || $Lang->{off}; + if (! $ExistComp) { $ExistComp = " "; } + if (! $MBExistComp) { $MBExistComp = " "; } $compStr .= < $Backups[$i]{num} - $ltype - $is_compress - $MBExist - $MBExistComp - $ExistComp - $MBNew - $MBNewComp - $NewComp + $Backups[$i]{num} + $ltype + $is_compress + $MBExist + $MBExistComp + $ExistComp + $MBNew + $MBNewComp + $NewComp EOF $errStr .= < $Backups[$i]{num} - $ltype - $Lang->{XferLOG}, + $Backups[$i]{num} + $ltype + $Lang->{XferLOG}, $Lang->{Errors} - $Backups[$i]{xferErrs} - $Backups[$i]{xferBadFile} - $Backups[$i]{xferBadShare} - $Backups[$i]{tarErrs} + $Backups[$i]{xferErrs} + $Backups[$i]{xferBadFile} + $Backups[$i]{xferBadShare} + $Backups[$i]{tarErrs} EOF } @@ -164,39 +208,39 @@ EOF my $duration = sprintf("%.1f", $dur / 60); my $MB = sprintf("%.1f", $Restores[$i]{size} / (1024*1024)); my $MBperSec = sprintf("%.2f", $Restores[$i]{size} / (1024*1024*$dur)); - my $Restores_Result = $Lang->{failed}; - if ($Restores[$i]{result} ne "failed") { $Restores_Result = $Lang->{success}; } - $restoreStr .= <$Restores[$i]{num} - $Restores_Result - $startTime - $duration - $Restores[$i]{nFiles} - $MB - $Restores[$i]{tarCreateErrs} - $Restores[$i]{xferErrs} + my $Restores_Result = $Lang->{failed}; + if ($Restores[$i]{result} ne "failed") { $Restores_Result = $Lang->{success}; } + $restoreStr .= <$Restores[$i]{num} + $Restores_Result + $startTime + $duration + $Restores[$i]{nFiles} + $MB + $Restores[$i]{tarCreateErrs} + $Restores[$i]{xferErrs} EOF } if ( $restoreStr ne "" ) { - $restoreStr = eval("qq{$Lang->{Restore_Summary}}"); + $restoreStr = eval("qq{$Lang->{Restore_Summary}}"); } if ( @Backups == 0 ) { $warnStr = $Lang->{This_PC_has_never_been_backed_up}; } if ( defined($Hosts->{$host}) ) { my $user = $Hosts->{$host}{user}; - my @moreUsers = sort(keys(%{$Hosts->{$host}{moreUsers}})); - my $moreUserStr; - foreach my $u ( sort(keys(%{$Hosts->{$host}{moreUsers}})) ) { - $moreUserStr .= ", " if ( $moreUserStr ne "" ); - $moreUserStr .= "${UserLink($u)}"; - } - if ( $moreUserStr ne "" ) { - $moreUserStr = " ($Lang->{and} $moreUserStr).\n"; - } else { - $moreUserStr = ".\n"; - } + my @moreUsers = sort(keys(%{$Hosts->{$host}{moreUsers}})); + my $moreUserStr; + foreach my $u ( sort(keys(%{$Hosts->{$host}{moreUsers}})) ) { + $moreUserStr .= ", " if ( $moreUserStr ne "" ); + $moreUserStr .= "${UserLink($u)}"; + } + if ( $moreUserStr ne "" ) { + $moreUserStr = " ($Lang->{and} $moreUserStr).\n"; + } else { + $moreUserStr = ".\n"; + } if ( $user ne "" ) { $statusStr .= eval("qq{$Lang->{This_PC_is_used_by}$moreUserStr}"); } @@ -230,8 +274,8 @@ EOF $statusStr .= eval("qq{$Lang->{Last_status_is_state_StatusHost_state_reason_as_of_startTime}}"); if ( $StatusHost{state} ne "Status_backup_in_progress" - && $StatusHost{state} ne "Status_restore_in_progress" - && $StatusHost{error} ne "" ) { + && $StatusHost{state} ne "Status_restore_in_progress" + && $StatusHost{error} ne "" ) { $statusStr .= eval("qq{$Lang->{Last_error_is____EscHTML_StatusHost_error}}"); } my $priorStr = "Pings"; @@ -243,8 +287,8 @@ EOF $statusStr .= eval("qq{$Lang->{priorStr_to_host_have_succeeded_StatusHostaliveCnt_consecutive_times}}"); if ( $StatusHost{aliveCnt} >= $Conf{BlackoutGoodCnt} - && $Conf{BlackoutGoodCnt} >= 0 && $Conf{BlackoutHourBegin} >= 0 - && $Conf{BlackoutHourEnd} >= 0 ) { + && $Conf{BlackoutGoodCnt} >= 0 && $Conf{BlackoutHourBegin} >= 0 + && $Conf{BlackoutHourEnd} >= 0 ) { my(@days) = qw(Sun Mon Tue Wed Thu Fri Sat); my($days) = join(", ", @days[@{$Conf{BlackoutWeekDays}}]); my($t0) = sprintf("%d:%02d", $Conf{BlackoutHourBegin}, @@ -269,9 +313,8 @@ EOF } $startIncrStr = eval ("qq{$startIncrStr}"); - - Header(eval("qq{$Lang->{Host__host_Backup_Summary}}")); - print(eval("qq{$Lang->{Host__host_Backup_Summary2}}")); + my $content = eval("qq{$Lang->{Host__host_Backup_Summary2}}"); + Header(eval("qq{$Lang->{Host__host_Backup_Summary}}"), $content); Trailer(); }