Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Weilbach <felix.weilbach@nextcloud.com>2021-03-19 12:40:26 +0300
committerFelix Weilbach (Rebase PR Action) <felix.weilbach@t-online.de>2021-03-22 10:48:39 +0300
commitb1983d7d19a8258159909f975941eccb0d73e3c7 (patch)
treee293a15160506b52ecc29187de6c47ea021ee9ca /src/libsync
parent54c1ab8828f74b6cd96270f3ded754e7ea43e789 (diff)
Increase logging around file removal events
To better see what is going on when and if files are removed by the client. See also: #260, #1433, #2913 Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
Diffstat (limited to 'src/libsync')
-rw-r--r--src/libsync/discovery.cpp3
-rw-r--r--src/libsync/propagateremotedelete.cpp2
-rw-r--r--src/libsync/propagatorjobs.cpp4
3 files changed, 8 insertions, 1 deletions
diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index 95cb7bf34..edded199a 100644
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -715,6 +715,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
// Not modified locally (ParentNotChanged)
if (noServerEntry) {
// not on the server: Removed on the server, delete locally
+ qCInfo(lcDisco) << "File" << item->_file << "is not anymore on server. Going to delete it locally.";
item->_instruction = CSYNC_INSTRUCTION_REMOVE;
item->_direction = SyncFileItem::Down;
} else if (dbEntry._type == ItemTypeVirtualFileDehydration) {
@@ -739,6 +740,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
} else if (!serverModified) {
// Removed locally: also remove on the server.
if (!dbEntry._serverHasIgnoredFiles) {
+ qCInfo(lcDisco) << "File" << item->_file << "was deleted locally. Going to delete it on the server.";
item->_instruction = CSYNC_INSTRUCTION_REMOVE;
item->_direction = SyncFileItem::Up;
}
@@ -777,6 +779,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
} else if (!typeChange && ((dbEntry._modtime == localEntry.modtime && dbEntry._fileSize == localEntry.size) || localEntry.isDirectory)) {
// Local file unchanged.
if (noServerEntry) {
+ qCInfo(lcDisco) << "File" << item->_file << "is not anymore on server. Going to delete it locally.";
item->_instruction = CSYNC_INSTRUCTION_REMOVE;
item->_direction = SyncFileItem::Down;
} else if (dbEntry._type == ItemTypeVirtualFileDehydration || localEntry.type == ItemTypeVirtualFileDehydration) {
diff --git a/src/libsync/propagateremotedelete.cpp b/src/libsync/propagateremotedelete.cpp
index 26073e7bc..5006ff432 100644
--- a/src/libsync/propagateremotedelete.cpp
+++ b/src/libsync/propagateremotedelete.cpp
@@ -28,6 +28,8 @@ Q_LOGGING_CATEGORY(lcPropagateRemoteDelete, "nextcloud.sync.propagator.remotedel
void PropagateRemoteDelete::start()
{
+ qCInfo(lcPropagateRemoteDelete) << "Start propagate remote delete job for" << _item->_file;
+
if (propagator()->_abortRequested)
return;
diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp
index b286c1504..469e96600 100644
--- a/src/libsync/propagatorjobs.cpp
+++ b/src/libsync/propagatorjobs.cpp
@@ -89,13 +89,15 @@ bool PropagateLocalRemove::removeRecursively(const QString &path)
void PropagateLocalRemove::start()
{
+ qCInfo(lcPropagateLocalRemove) << "Start propagate local remove job";
+
_moveToTrash = propagator()->syncOptions()._moveFilesToTrash;
if (propagator()->_abortRequested)
return;
const QString filename = propagator()->fullLocalPath(_item->_file);
- qCDebug(lcPropagateLocalRemove) << filename;
+ qCInfo(lcPropagateLocalRemove) << "Going to delete:" << filename;
if (propagator()->localFileNameClash(_item->_file)) {
done(SyncFileItem::NormalError, tr("Could not remove %1 because of a local file name clash").arg(QDir::toNativeSeparators(filename)));