From 7fd2f292e72b35ed0ec347cb2a7db575125633d4 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Thu, 11 May 2017 15:36:47 +0200 Subject: [PATCH] Promote a few more logs to info/warning --- src/gui/application.cpp | 2 +- src/gui/lockwatcher.cpp | 4 ++-- src/libsync/abstractnetworkjob.cpp | 2 +- src/libsync/owncloudpropagator.cpp | 5 ++++- src/libsync/propagateupload.cpp | 1 - src/libsync/propagateuploadv1.cpp | 2 +- src/libsync/propagatorjobs.cpp | 2 +- src/libsync/syncengine.cpp | 5 ++++- 8 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/gui/application.cpp b/src/gui/application.cpp index c9f8f173a..04e817634 100644 --- a/src/gui/application.cpp +++ b/src/gui/application.cpp @@ -364,7 +364,7 @@ void Application::setupLogging() Logger::instance()->enterNextLogFile(); - qCDebug(lcApplication) << QString::fromLatin1( "################## %1 %2 (%3) %4 on %5").arg(_theme->appName()) + qCInfo(lcApplication) << QString::fromLatin1( "################## %1 locale:[%2] ui_lang:[%3] version:[%4] os:[%5]").arg(_theme->appName()) .arg( QLocale::system().name() ) .arg(property("ui_lang").toString()) .arg(_theme->version()) diff --git a/src/gui/lockwatcher.cpp b/src/gui/lockwatcher.cpp index 55e6bcbba..832edc900 100644 --- a/src/gui/lockwatcher.cpp +++ b/src/gui/lockwatcher.cpp @@ -34,7 +34,7 @@ LockWatcher::LockWatcher(QObject* parent) void LockWatcher::addFile(const QString& path) { - qCDebug(lcLockWatcher) << "Watching for lock of" << path << "being released"; + qCInfo(lcLockWatcher) << "Watching for lock of" << path << "being released"; _watchedPaths.insert(path); } @@ -44,7 +44,7 @@ void LockWatcher::checkFiles() foreach (const QString& path, _watchedPaths) { if (!FileSystem::isFileLocked(path)) { - qCDebug(lcLockWatcher) << "Lock of" << path << "was released"; + qCInfo(lcLockWatcher) << "Lock of" << path << "was released"; emit fileUnlocked(path); unlocked.insert(path); } diff --git a/src/libsync/abstractnetworkjob.cpp b/src/libsync/abstractnetworkjob.cpp index c62a3ae37..5f6d7aa82 100644 --- a/src/libsync/abstractnetworkjob.cpp +++ b/src/libsync/abstractnetworkjob.cpp @@ -266,7 +266,7 @@ void AbstractNetworkJob::start() void AbstractNetworkJob::slotTimeout() { _timedout = true; - qCDebug(lcNetworkJob) << this << "Timeout" << (reply() ? reply()->request().url() : path()); + qCWarning(lcNetworkJob) << "Network job timeout" << (reply() ? reply()->request().url() : path()); onTimedOut(); } diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp index dc5d9fe1b..2f18e45c5 100644 --- a/src/libsync/owncloudpropagator.cpp +++ b/src/libsync/owncloudpropagator.cpp @@ -264,7 +264,10 @@ void PropagateItemJob::done(SyncFileItem::Status statusArg, const QString &error break; } - qCInfo(lcPropagator) << "Completed propagation of" << _item->destination() << "by" << this << "with status" << _item->_status << "and error:" << _item->_errorString; + if (_item->hasErrorStatus()) + qCWarning(lcPropagator) << "Could not complete propagation of" << _item->destination() << "by" << this << "with status" << _item->_status << "and error:" << _item->_errorString; + else + qCInfo(lcPropagator) << "Completed propagation of" << _item->destination() << "by" << this << "with status" << _item->_status; emit propagator()->itemCompleted(_item); emit finished(_item->_status); diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp index 8988f9a3b..5467d1aa5 100644 --- a/src/libsync/propagateupload.cpp +++ b/src/libsync/propagateupload.cpp @@ -523,7 +523,6 @@ void PropagateUploadFileCommon::abort() { foreach(auto *job, _jobs) { if (job->reply()) { - qCDebug(lcPropagateUpload) << job << this->_item->_file; job->reply()->abort(); } } diff --git a/src/libsync/propagateuploadv1.cpp b/src/libsync/propagateuploadv1.cpp index 6a266f3ac..10f6a4fb2 100644 --- a/src/libsync/propagateuploadv1.cpp +++ b/src/libsync/propagateuploadv1.cpp @@ -46,7 +46,7 @@ void PropagateUploadFileV1::doStartUpload() if (progressInfo._valid && Utility::qDateTimeToTime_t(progressInfo._modtime) == _item->_modtime ) { _startChunk = progressInfo._chunk; _transferId = progressInfo._transferid; - qCDebug(lcPropagateUpload) << _item->_file << ": Resuming from chunk " << _startChunk; + qCInfo(lcPropagateUpload) << _item->_file << ": Resuming from chunk " << _startChunk; } _currentChunk = 0; diff --git a/src/libsync/propagatorjobs.cpp b/src/libsync/propagatorjobs.cpp index 94bab37b1..c2e08d5a3 100644 --- a/src/libsync/propagatorjobs.cpp +++ b/src/libsync/propagatorjobs.cpp @@ -162,7 +162,7 @@ void PropagateLocalMkdir::start() } if( Utility::fsCasePreserving() && propagator()->localFileNameClash(_item->_file ) ) { - qCDebug(lcPropagateLocalMkdir) << "WARN: new folder to create locally already exists!"; + qCWarning(lcPropagateLocalMkdir) << "New folder to create locally already exists with different case:" << _item->_file; done( SyncFileItem::NormalError, tr("Attention, possible case sensitivity clash with %1").arg(newDirStr) ); return; } diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index 9c197c8eb..9673d7a4c 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -1464,9 +1464,12 @@ AccountPtr SyncEngine::account() const void SyncEngine::abort() { + if (_propagator) + qCInfo(lcEngine) << "Aborting sync"; + // Sets a flag for the update phase csync_request_abort(_csync_ctx); - qCDebug(lcEngine) << "Aborting sync, _discoveryMainThread:" << _discoveryMainThread; + // Aborts the discovery phase job if (_discoveryMainThread) { _discoveryMainThread->abort(); -- 2.30.2