Skip to content

Commit

Permalink
Fixes formatting error in executor (duplicate 'name' and duplicate qu…
Browse files Browse the repository at this point in the history
…otes)
  • Loading branch information
luc-guyot-infomaniak committed Jan 17, 2025
1 parent 545e19d commit c1bd4de
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions src/libsyncengine/propagation/executor/executorworker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,10 @@ void ExecutorWorker::logCorrespondingNodeErrorMsg(const SyncOpPtr syncOp) {
const std::wstring mainMsg = L"Error in UpdateTree::deleteNode: ";
if (syncOp->correspondingNode()) {
const auto nodeName = Utility::formatSyncName(syncOp->correspondingNode()->name());
LOGW_SYNCPAL_WARN(_logger, mainMsg << L"correspondingNode name=" << L"'" << nodeName << L"'.");
LOGW_SYNCPAL_WARN(_logger, mainMsg << L"correspondingNode " << nodeName);
} else {
const auto nodeName = Utility::formatSyncName(syncOp->affectedNode()->name());
LOGW_SYNCPAL_WARN(_logger,
mainMsg << L"correspondingNode is nullptr, former affectedNode name=" << L"'" << nodeName << L"'.");
LOGW_SYNCPAL_WARN(_logger, mainMsg << L"correspondingNode is nullptr, former affectedNode " << nodeName);
}
}

Expand Down Expand Up @@ -1857,12 +1856,12 @@ ExitInfo ExecutorWorker::propagateConflictToDbAndTree(SyncOpPtr syncOp, bool &pr
}
// Remove node from update tree
if (!_syncPal->updateTree(ReplicaSide::Local)->deleteNode(syncOp->conflict().localNode())) {
LOGW_SYNCPAL_WARN(_logger, L"Error in UpdateTree::deleteNode: node name="
LOGW_SYNCPAL_WARN(_logger, L"Error in UpdateTree::deleteNode: node "
<< Utility::formatSyncName(syncOp->conflict().localNode()->name()));
}

if (!_syncPal->updateTree(ReplicaSide::Remote)->deleteNode(syncOp->conflict().remoteNode())) {
LOGW_SYNCPAL_WARN(_logger, L"Error in UpdateTree::deleteNode: node name="
LOGW_SYNCPAL_WARN(_logger, L"Error in UpdateTree::deleteNode: node "
<< Utility::formatSyncName(syncOp->conflict().remoteNode()->name()));
}

Expand Down

0 comments on commit c1bd4de

Please sign in to comment.