Cleanup logging for backup cleanup

This commit is contained in:
Ryan Huffman 2018-02-15 11:02:29 -08:00
parent 4b2e907ada
commit df809f5a3e

View file

@ -295,18 +295,21 @@ void DomainContentBackupManager::removeOldBackupVersions(const BackupRule& rule)
backupDir.entryInfoList({ AUTOMATIC_BACKUP_PREFIX + rule.extensionFormat + "*.zip" }, QDir::Files | QDir::NoSymLinks, QDir::Name); backupDir.entryInfoList({ AUTOMATIC_BACKUP_PREFIX + rule.extensionFormat + "*.zip" }, QDir::Files | QDir::NoSymLinks, QDir::Name);
int backupsToDelete = matchingFiles.length() - rule.maxBackupVersions; int backupsToDelete = matchingFiles.length() - rule.maxBackupVersions;
qCDebug(domain_server) << "Found" << matchingFiles.length() << "backups, deleting " << backupsToDelete << "backup(s)"; if (backupsToDelete <= 0) {
for (int i = 0; i < backupsToDelete; ++i) { qCDebug(domain_server) << "Found" << matchingFiles.length() << "backups, no backups need to be deleted";
auto fileInfo = matchingFiles[i].absoluteFilePath(); } else {
QFile backupFile(fileInfo); qCDebug(domain_server) << "Found" << matchingFiles.length() << "backups, deleting " << backupsToDelete << "backup(s)";
if (backupFile.remove()) { for (int i = 0; i < backupsToDelete; ++i) {
qCDebug(domain_server) << "Removed old backup: " << backupFile.fileName(); auto fileInfo = matchingFiles[i].absoluteFilePath();
} else { QFile backupFile(fileInfo);
qCDebug(domain_server) << "Failed to remove old backup: " << backupFile.fileName(); if (backupFile.remove()) {
qCDebug(domain_server) << "Removed old backup: " << backupFile.fileName();
} else {
qCDebug(domain_server) << "Failed to remove old backup: " << backupFile.fileName();
}
} }
qCDebug(domain_server) << "Done removing old backup versions";
} }
qCDebug(domain_server) << "Done removing old backup versions";
} else { } else {
qCDebug(domain_server) << "Rolling backups for rule" << rule.name << "." qCDebug(domain_server) << "Rolling backups for rule" << rule.name << "."
<< " Max Rolled Backup Versions less than 1 [" << rule.maxBackupVersions << "]." << " Max Rolled Backup Versions less than 1 [" << rule.maxBackupVersions << "]."