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

remove too verbose logs during discovery #7263

Merged
merged 5 commits into from
Oct 7, 2024
Merged

remove too verbose logs during discovery #7263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8899276
remove too verbose logs during discovery
mgallien Oct 3, 2024
9e1b2b3
remove useless internal log about remote permissions management
mgallien Oct 3, 2024
a2b0887
remove too verbose not so usefull logs
mgallien Oct 3, 2024
8ecf0e9
remove internal logs in propagation scheduler: not usefull
mgallien Oct 3, 2024
f0f83b9
downgrade severity level of logs during propagation
mgallien Oct 3, 2024
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
1 change: 0 additions & 1 deletion src/common/remotepermissions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ RemotePermissions RemotePermissions::internalFromServerString(const QString &val
So replace the 'M' by a 'm' for every sub entries in an external storage */
perm.unsetPermission(RemotePermissions::IsMounted);
perm.setPermission(RemotePermissions::IsMountedSub);
qCInfo(lcRemotePermissions()) << otherProperties.value(QStringLiteral("permissions")) << "replacing M permissions by m for subfolders inside a group folder";
}

return perm;
Expand Down
6 changes: 3 additions & 3 deletions src/gui/tray/usermodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ void User::processCompletedSyncItem(const Folder *folder, const SyncFileItemPtr
activity._fileAction = fileActionFromInstruction(item->_instruction);

if (item->_status == SyncFileItem::NoStatus || item->_status == SyncFileItem::Success) {
qCWarning(lcActivity) << "Item " << item->_file << " retrieved successfully.";
qCDebug(lcActivity) << "Item " << item->_file << " retrieved successfully.";

if (item->_direction != SyncFileItem::Up) {
activity._message = QObject::tr("Synced %1").arg(fileName);
Expand Down Expand Up @@ -839,7 +839,7 @@ void User::processCompletedSyncItem(const Folder *folder, const SyncFileItemPtr

_activityModel->addSyncFileItemToActivityList(activity);
} else {
qCWarning(lcActivity) << "Item " << item->_file << " retrieved resulted in error " << item->_errorString;
qCInfo(lcActivity) << "Item " << item->_file << " retrieved resulted in error " << item->_errorString;

activity._subject = item->_errorString;
activity._id = -static_cast<int>(qHash(activity._subject + activity._message));
Expand Down Expand Up @@ -885,7 +885,7 @@ void User::slotItemCompleted(const QString &folder, const SyncFileItemPtr &item)
return;
}

qCWarning(lcActivity) << "Item " << item->_file << " retrieved resulted in " << item->_errorString;
qCDebug(lcActivity) << "Item " << item->_file << " retrieved resulted in " << item->_errorString;
processCompletedSyncItem(folderInstance, item);
}

Expand Down
1 change: 0 additions & 1 deletion src/libsync/cookiejar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ bool CookieJar::setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const
QList<QNetworkCookie> CookieJar::cookiesForUrl(const QUrl &url) const
{
QList<QNetworkCookie> cookies = QNetworkCookieJar::cookiesForUrl(url);
qCDebug(lcCookieJar) << url << "requests:" << cookies;
return cookies;
}

Expand Down
16 changes: 0 additions & 16 deletions src/libsync/discovery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,16 +716,6 @@ void ProcessDirectoryJob::processFileAnalyzeRemoteInfo(const SyncFileItemPtr &it
item->_lockTimeout = serverEntry.lockTimeout;
item->_lockToken = serverEntry.lockToken;

qCDebug(lcDisco()) << "item lock for:" << item->_file
<< item->_locked
<< item->_lockOwnerDisplayName
<< item->_lockOwnerId
<< item->_lockOwnerType
<< item->_lockEditorApp
<< item->_lockTime
<< item->_lockTimeout
<< item->_lockToken;

// Check for missing server data
{
QStringList missingData;
Expand Down Expand Up @@ -753,18 +743,12 @@ void ProcessDirectoryJob::processFileAnalyzeRemoteInfo(const SyncFileItemPtr &it
// Add on a second as a precaution, sometimes we catch the server before it has had a chance to update
const auto lockExpirationTimeout = qMax(5LL, timeRemaining + 1);

qCDebug(lcDisco) << "File:" << path._original << "is locked."
<< "Lock expires in:" << lockExpirationTimeout << "seconds."
<< "A sync run will be scheduled for around that time.";

_discoveryData->_anotherSyncNeeded = true;
_discoveryData->_filesNeedingScheduledSync.insert(path._original, lockExpirationTimeout);

} else if (serverEntry.locked == SyncFileItem::LockStatus::UnlockedItem && dbEntry._lockstate._locked) {
// We have received data that this file has been unlocked remotely, so let's notify the sync engine
// that we no longer need a scheduled sync run for this file
qCInfo(lcDisco) << "File:" << path._original << "is unlocked and a scheduled sync is no longer needed."
<< "Will remove scheduled sync if there is one.";

_discoveryData->_filesUnscheduleSync.append(path._original);
}
Expand Down
3 changes: 0 additions & 3 deletions src/libsync/discoveryphase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,6 @@ static void propertyMapToRemoteInfo(const QMap<QString, QString> &map, RemotePer
} else if (property == QLatin1String("getlastmodified")) {
value.replace("GMT", "+0000");
const auto date = QDateTime::fromString(value, Qt::RFC2822Date);
qCInfo(lcDiscovery()) << value << date << date.isValid() << QDateTime::currentDateTime().toString(Qt::RFC2822Date);
Q_ASSERT(date.isValid());
result.modtime = 0;
if (date.toSecsSinceEpoch() > 0) {
Expand Down Expand Up @@ -567,7 +566,6 @@ void DiscoverySingleDirectoryJob::directoryListingIteratedSlot(const QString &fi
auto perm = RemotePermissions::fromServerString(map.value("permissions"),
_account->serverHasMountRootProperty() ? RemotePermissions::MountedPermissionAlgorithm::UseMountRootProperty : RemotePermissions::MountedPermissionAlgorithm::WildGuessMountedSubProperty,
map);
qCInfo(lcDiscovery()) << file << map.value("permissions") << map;
emit firstDirectoryPermissions(perm);
_isExternalStorage = perm.hasPermission(RemotePermissions::IsMounted);
}
Expand Down Expand Up @@ -602,7 +600,6 @@ void DiscoverySingleDirectoryJob::directoryListingIteratedSlot(const QString &fi
if (result.isDirectory)
result.size = 0;

qCInfo(lcDiscovery()) << file << map.value("permissions") << result.remotePerm.toString() << map;
_results.push_back(std::move(result));
}

Expand Down
8 changes: 0 additions & 8 deletions src/libsync/owncloudpropagator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1579,8 +1579,6 @@ void PropagateRootDirectory::appendDirDeletionJob(PropagatorJob *job)

bool PropagateRootDirectory::scheduleSelfOrChild()
{
qCInfo(lcRootDirectory()) << "scheduleSelfOrChild" << _state << "pending uploads" << propagator()->delayedTasks().size() << "subjobs state" << _subJobs._state;

if (_state == Finished) {
return false;
}
Expand All @@ -1603,8 +1601,6 @@ bool PropagateRootDirectory::scheduleSelfOrChild()

void PropagateRootDirectory::slotSubJobsFinished(SyncFileItem::Status status)
{
qCInfo(lcRootDirectory()) << status << "slotSubJobsFinished" << _state << "pending uploads" << propagator()->delayedTasks().size() << "subjobs state" << _subJobs._state;

if (!propagator()->delayedTasks().empty()) {
scheduleDelayedJobs();
return;
Expand All @@ -1619,7 +1615,6 @@ void PropagateRootDirectory::slotSubJobsFinished(SyncFileItem::Status status)
// Synchronously abort
abort(AbortType::Synchronous);
_state = Finished;
qCInfo(lcPropagator) << "PropagateRootDirectory::slotSubJobsFinished" << "emit finished" << status;
emit finished(status);
}
return;
Expand Down Expand Up @@ -1653,18 +1648,15 @@ void PropagateRootDirectory::slotSubJobsFinished(SyncFileItem::Status status)
void PropagateRootDirectory::slotDirDeletionJobsFinished(SyncFileItem::Status status)
{
if (_errorStatus != SyncFileItem::NoStatus && status == SyncFileItem::Success) {
qCInfo(lcPropagator) << "PropagateRootDirectory::slotDirDeletionJobsFinished" << "reporting previous error" << _errorStatus;
status = _errorStatus;
}

_state = Finished;
qCInfo(lcPropagator) << "PropagateRootDirectory::slotDirDeletionJobsFinished" << "emit finished" << status;
emit finished(status);
}

bool PropagateRootDirectory::scheduleDelayedJobs()
{
qCInfo(lcPropagator) << "PropagateRootDirectory::scheduleDelayedJobs";
propagator()->setScheduleDelayedTasks(true);
auto bulkPropagatorJob = std::make_unique<BulkPropagatorJob>(propagator(), propagator()->delayedTasks());
propagator()->clearDelayedTasks();
Expand Down
1 change: 0 additions & 1 deletion src/libsync/syncfileitem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ SyncJournalFileRecord SyncFileItem::toSyncJournalFileRecordWithInode(const QStri
// Update the inode if possible
rec._inode = _inode;
if (FileSystem::getInode(localFileName, &rec._inode)) {
qCDebug(lcFileItem) << localFileName << "Retrieved inode " << rec._inode << "(previous item inode: " << _inode << ")";
} else {
// use the "old" inode coming with the item for the case where the
// filesystem stat fails. That can happen if the the file was removed
Expand Down
Loading