mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 15:06:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7046 from nextcloud/backport/7029/stable-3.14

Browse source 
[stable-3.14] Bugfix/log database errors
This commit is contained in:
Matthieu Gallien 2024-08-28 23:09:49 +02:00 committed by GitHub
commit 9fbef4c566
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 377 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

435
src/common/syncjournaldb.cpp
View file

File diff suppressed because it is too large Load diff

25
src/gui/generalsettings.cpp
View file

@ -67,11 +67,24 @@ ZipEntry fileInfoToLogZipEntry(const QFileInfo &info)
return entry;
}
ZipEntry syncFolderToZipEntry(OCC::Folder *f)
QVector<ZipEntry> syncFolderToDatabaseZipEntry(OCC::Folder *f)
{
QVector<ZipEntry> result;
const auto journalPath = f->journalDb()->databaseFilePath();
const auto journalInfo = QFileInfo(journalPath);
return fileInfoToZipEntry(journalInfo);
const auto walJournalInfo = QFileInfo(journalPath + "-wal");
const auto shmJournalInfo = QFileInfo(journalPath + "-shm");
result += fileInfoToZipEntry(journalInfo);
if (walJournalInfo.exists()) {
result += fileInfoToZipEntry(walJournalInfo);
}
if (shmJournalInfo.exists()) {
result += fileInfoToZipEntry(shmJournalInfo);
}
return result;
}
QVector<ZipEntry> createDebugArchiveFileList()
@ -94,9 +107,11 @@ QVector<ZipEntry> createDebugArchiveFileList()
}
const auto folders = OCC::FolderMan::instance()->map().values();
std::transform(std::cbegin(folders), std::cend(folders),
std::back_inserter(list),
syncFolderToZipEntry);
std::for_each(std::cbegin(folders), std::cend(folders),
[&list] (auto &folderIt) {
const auto &newEntries = syncFolderToDatabaseZipEntry(folderIt);
std::copy(std::cbegin(newEntries), std::cend(newEntries), std::back_inserter(list));
});
return list;
}