Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable-3.15] Log path strings directly instead of accumulating #7820

Merged
merged 2 commits into from
Feb 5, 2025
Merged

[stable-3.15] Log path strings directly instead of accumulating #7820

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b033da9
Log path strings directly instead of accumulating
Diff-fusion Jan 4, 2025
b5b96d6
Check if discovery paths are empty before logging
Diff-fusion Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/libsync/syncengine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1216,12 +1216,14 @@ void SyncEngine::setLocalDiscoveryOptions(LocalDiscoveryStyle style, std::set<QS
_localDiscoveryStyle = style;
_localDiscoveryPaths = std::move(paths);

const auto allPaths = std::accumulate(_localDiscoveryPaths.begin(), _localDiscoveryPaths.end(), QString{}, [] (auto first, auto second) -> QString {
first += ", " + second;
return first;
});

qCInfo(lcEngine()) << "paths to discover locally" << allPaths;
if (lcEngine().isInfoEnabled() && !_localDiscoveryPaths.empty()) {
// only execute if logging is enabled
auto debug = qInfo(lcEngine);
debug << "paths to discover locally";
for (auto path : _localDiscoveryPaths) {
debug << path;
}
}

// Normalize to make sure that no path is a contained in another.
// Note: for simplicity, this code consider anything less than '/' as a path separator, so for
Expand Down
Loading