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

Jump to bottom

[stable-3.10] Do not show failure popul for VFS when hydration finished with code 200 or 204. #6163

Merged
merged 1 commit into from
Oct 24, 2023
Merged

[stable-3.10] Do not show failure popul for VFS when hydration finished with code 200 or 204. #6163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions src/libsync/vfs/cfapi/hydrationjob.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*

Check notice on line 1 in src/libsync/vfs/cfapi/hydrationjob.cpp

View workflow job for this annotation

GitHub Actions / build

Run clang-format on src/libsync/vfs/cfapi/hydrationjob.cpp 

File src/libsync/vfs/cfapi/hydrationjob.cpp (lines 356): Code does not conform to Custom style guidelines.
* Copyright (C) by Kevin Ottens <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -351,9 +351,15 @@
{
_errorCode = _job->reply()->error();
_statusCode = _job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
_errorString = _job->reply()->errorString();

qCInfo(lcHydration) << "GETFileJob finished" << _requestId << _folderPath << _errorCode << _statusCode << _errorString;
if (_errorCode != 0 || (_statusCode != 200 && _statusCode != 204)) {
_errorString = _job->reply()->errorString();
}

if (!_errorString.isEmpty()) {
qCInfo(lcHydration) << "GETFileJob finished" << _requestId << _folderPath << _errorCode << _statusCode << _errorString;
} else {
qCInfo(lcHydration) << "GETFileJob finished" << _requestId << _folderPath;
}
// GETFileJob deletes itself after this signal was handled
_job = nullptr;
if (_isCancelled) {
Expand Down
Loading