Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 00:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #4290 from ZappoMan/backupFixes

Browse source 
fix a couple of bugs in backup settings
This commit is contained in:
Andrew Meadows 2015-02-16 09:56:20 -08:00
commit 935b5ab5b3
1 changed files with 61 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
libraries/octree/src/OctreePersistThread.cpp
View file

@ -49,14 +49,32 @@ void OctreePersistThread::parseSettings(const QJsonObject& settings) {
qDebug() << "BACKUP RULES:"; qDebug() << "BACKUP RULES:";
foreach (const QJsonValue& value, backupRules) { foreach (const QJsonValue& value, backupRules) {
QJsonObject obj = value.toObject(); QJsonObject obj = value.toObject();
int interval = 0;
int count = 0;
QJsonValue intervalVal = obj["backupInterval"];
if (intervalVal.isString()) {
interval = intervalVal.toString().toInt();
} else {
interval = intervalVal.toInt();
}
QJsonValue countVal = obj["maxBackupVersions"];
if (countVal.isString()) {
count = countVal.toString().toInt();
} else {
count = countVal.toInt();
}
qDebug() << " Name:" << obj["Name"].toString(); qDebug() << " Name:" << obj["Name"].toString();
qDebug() << " format:" << obj["format"].toString(); qDebug() << " format:" << obj["format"].toString();
qDebug() << " interval:" << obj["backupInterval"].toInt(); qDebug() << " interval:" << interval;
qDebug() << " count:" << obj["maxBackupVersions"].toInt(); qDebug() << " count:" << count;
BackupRule newRule = { obj["Name"].toString(), obj["backupInterval"].toInt(), BackupRule newRule = { obj["Name"].toString(), interval, obj["format"].toString(), count, 0};
obj["format"].toString(), obj["maxBackupVersions"].toInt(), 0};
newRule.lastBackup = getMostRecentBackupTimeInUsecs(obj["format"].toString()); newRule.lastBackup = getMostRecentBackupTimeInUsecs(obj["format"].toString());
@ -321,29 +339,35 @@ bool OctreePersistThread::getMostRecentBackup(const QString& format,
void OctreePersistThread::rollOldBackupVersions(const BackupRule& rule) { void OctreePersistThread::rollOldBackupVersions(const BackupRule& rule) {
if (rule.extensionFormat.contains("%N")) { if (rule.extensionFormat.contains("%N")) {
qDebug() << "Rolling old backup versions for rule" << rule.name << "..."; if (rule.maxBackupVersions > 0) {
for(int n = rule.maxBackupVersions - 1; n > 0; n--) { qDebug() << "Rolling old backup versions for rule" << rule.name << "...";
QString backupExtensionN = rule.extensionFormat; for(int n = rule.maxBackupVersions - 1; n > 0; n--) {
QString backupExtensionNplusOne = rule.extensionFormat; QString backupExtensionN = rule.extensionFormat;
backupExtensionN.replace(QString("%N"), QString::number(n)); QString backupExtensionNplusOne = rule.extensionFormat;
backupExtensionNplusOne.replace(QString("%N"), QString::number(n+1)); backupExtensionN.replace(QString("%N"), QString::number(n));
backupExtensionNplusOne.replace(QString("%N"), QString::number(n+1));
QString backupFilenameN = _filename + backupExtensionN; QString backupFilenameN = _filename + backupExtensionN;
QString backupFilenameNplusOne = _filename + backupExtensionNplusOne; QString backupFilenameNplusOne = _filename + backupExtensionNplusOne;
QFile backupFileN(backupFilenameN); QFile backupFileN(backupFilenameN);
if (backupFileN.exists()) { if (backupFileN.exists()) {
qDebug() << "rolling backup file " << backupFilenameN << "to" << backupFilenameNplusOne << "..."; qDebug() << "rolling backup file " << backupFilenameN << "to" << backupFilenameNplusOne << "...";
int result = rename(qPrintable(backupFilenameN), qPrintable(backupFilenameNplusOne)); int result = rename(qPrintable(backupFilenameN), qPrintable(backupFilenameNplusOne));
if (result == 0) { if (result == 0) {
qDebug() << "DONE rolling backup file " << backupFilenameN << "to" << backupFilenameNplusOne << "..."; qDebug() << "DONE rolling backup file " << backupFilenameN << "to" << backupFilenameNplusOne << "...";
} else { } else {
qDebug() << "ERROR in rolling backup file " << backupFilenameN << "to" << backupFilenameNplusOne << "..."; qDebug() << "ERROR in rolling backup file " << backupFilenameN << "to" << backupFilenameNplusOne << "...";
}
} }
} }
qDebug() << "Done rolling old backup versions...";
} else {
qDebug() << "Rolling backups for rule" << rule.name << "."
<< " Max Rolled Backup Versions less than 1 [" << rule.maxBackupVersions << "]."
<< " No need to roll backups...";
} }
qDebug() << "Done rolling old backup versions...";
} }
} }
@ -384,19 +408,25 @@ void OctreePersistThread::backup() {
} }
QFile persistFile(_filename); if (rule.maxBackupVersions > 0) {
if (persistFile.exists()) { QFile persistFile(_filename);
qDebug() << "backing up persist file " << _filename << "to" << backupFileName << "..."; if (persistFile.exists()) {
bool result = QFile::copy(_filename, backupFileName); qDebug() << "backing up persist file " << _filename << "to" << backupFileName << "...";
if (result) { bool result = QFile::copy(_filename, backupFileName);
qDebug() << "DONE backing up persist file..."; if (result) {
rule.lastBackup = now; // only record successful backup in this case. qDebug() << "DONE backing up persist file...";
rule.lastBackup = now; // only record successful backup in this case.
} else {
qDebug() << "ERROR in backing up persist file...";
}
} else { } else {
qDebug() << "ERROR in backing up persist file..."; qDebug() << "persist file " << _filename << " does not exist. " <<
"nothing to backup for this rule ["<< rule.name << "]...";
} }
} else { } else {
qDebug() << "persist file " << _filename << " does not exist. " << qDebug() << "This backup rule" << rule.name
"nothing to backup for this rule ["<< rule.name << "]..."; << " has Max Rolled Backup Versions less than 1 [" << rule.maxBackupVersions << "]."
<< " There are no backups to be done...";
} }
} else { } else {
qDebug() << "Backup not needed for this rule ["<< rule.name << "]..."; qDebug() << "Backup not needed for this rule ["<< rule.name << "]...";