projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Large set of changes for config editing, rsync hardlinks etc
[BackupPC.git]
/
bin
/
BackupPC_sendEmail
diff --git
a/bin/BackupPC_sendEmail
b/bin/BackupPC_sendEmail
index
ff6ddc7
..
cb5c533
100755
(executable)
--- a/
bin/BackupPC_sendEmail
+++ b/
bin/BackupPC_sendEmail
@@
-82,7
+82,8
@@
my $mesg = "";
my @badHosts = ();
foreach my $host ( sort(keys(%Status)) ) {
my @badHosts = ();
foreach my $host ( sort(keys(%Status)) ) {
- next if ( $Status{$host}{reason} ne "backup failed"
+ next if ( ($Status{$host}{reason} ne "Reason_backup_failed"
+ && $Status{$host}{reason} ne "Reason_restore_failed")
|| $Status{$host}{error} =~ /^lost network connection to host/ );
push(@badHosts, "$host ($Status{$host}{error})");
}
|| $Status{$host}{error} =~ /^lost network connection to host/ );
push(@badHosts, "$host ($Status{$host}{error})");
}
@@
-121,7
+122,7
@@
my @oldDirs = ();
my @files = $d->read;
$d->close;
foreach my $host ( @files ) {
my @files = $d->read;
$d->close;
foreach my $host ( @files ) {
- next if ( $host
eq "." || $host eq ".."
|| defined($Status{$host}) );
+ next if ( $host
=~ /^\./
|| defined($Status{$host}) );
push(@oldDirs, "$TopDir/pc/$host");
}
if ( @oldDirs ) {
push(@oldDirs, "$TopDir/pc/$host");
}
if ( @oldDirs ) {
@@
-216,7
+217,7
@@
foreach my $host ( sort(keys(%Status)) ) {
while ( 1 ) {
my $s = $fh->readLine();
last if ( $s eq "" );
while ( 1 ) {
my $s = $fh->readLine();
last if ( $s eq "" );
- if ( $s =~ /^\s*Error reading file.*\.pst :
ERRDOS - ERRlock
/
+ if ( $s =~ /^\s*Error reading file.*\.pst :
(ERRDOS - ERRlock|NT_STATUS_FILE_LOCK_CONFLICT)
/
|| $s =~ /^\s*Error reading file.*\.pst\. Got 0 bytes/ ) {
$badOutlook = 1;
last;
|| $s =~ /^\s*Error reading file.*\.pst\. Got 0 bytes/ ) {
$badOutlook = 1;
last;