From fb6669b0ab3fba5290a3520b9697d8c5b14eed47 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 11 Sep 2024 17:16:08 +0200 Subject: [PATCH] improve some log that are produced during discovery would be usefull to track bugs during rename operations Signed-off-by: Matthieu Gallien --- src/libsync/discovery.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp index c1e4c788d3f9..8f17857926ec 100644 --- a/src/libsync/discovery.cpp +++ b/src/libsync/discovery.cpp @@ -64,7 +64,7 @@ ProcessDirectoryJob::ProcessDirectoryJob(const PathTuple &path, const SyncFileIt , _discoveryData(parent->_discoveryData) , _currentFolder(path) { - qCDebug(lcDisco) << path._server << queryServer << path._local << queryLocal << lastSyncTimestamp; + qCDebug(lcDisco) << "PREPARING" << _currentFolder._server << _queryServer << _currentFolder._local << _queryLocal; computePinState(parent->_pinState); } @@ -77,6 +77,7 @@ ProcessDirectoryJob::ProcessDirectoryJob(DiscoveryPhase *data, PinState basePinS , _discoveryData(data) , _currentFolder(path) { + qCDebug(lcDisco) << "PREPARING" << _currentFolder._server << _queryServer << _currentFolder._local << _queryLocal; computePinState(basePinState); } @@ -532,6 +533,7 @@ void ProcessDirectoryJob::processFile(PathTuple path, << " | checksum: " << dbEntry._checksumHeader << "//" << serverEntry.checksumHeader << " | perm: " << dbEntry._remotePerm << "//" << serverEntry.remotePerm << " | fileid: " << dbEntry._fileId << "//" << serverEntry.fileId + << " | inode: " << dbEntry._inode << "/" << localEntry.inode << "/" << " | type: " << dbEntry._type << "/" << localEntry.type << "/" << (serverEntry.isDirectory ? ItemTypeDirectory : ItemTypeFile) << " | e2ee: " << dbEntry.isE2eEncrypted() << "/" << serverEntry.isE2eEncrypted() << " | e2eeMangledName: " << dbEntry.e2eMangledName() << "/" << serverEntry.e2eMangledName @@ -1738,13 +1740,12 @@ void ProcessDirectoryJob::processFileFinalize( } { - const auto discoveredItemLog = QStringLiteral("%1 %2 %3 %4").arg(item->_file).arg(item->_instruction).arg(item->_direction).arg(item->_type); const auto isImportantInstruction = item->_instruction != CSYNC_INSTRUCTION_NONE && item->_instruction != CSYNC_INSTRUCTION_IGNORE && item->_instruction != CSYNC_INSTRUCTION_UPDATE_METADATA; if (isImportantInstruction) { - qCInfo(lcDisco) << discoveredItemLog; + qCInfo(lcDisco) << "discovered" << item->_file << item->_instruction << item->_direction << item->_type; } else { - qCDebug(lcDisco) << discoveredItemLog; + qCDebug(lcDisco) << "discovered" << item->_file << item->_instruction << item->_direction << item->_type; } }