diff options
-rw-r--r-- | common/synchronizer.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp index a8af114..57c5d90 100644 --- a/common/synchronizer.cpp +++ b/common/synchronizer.cpp | |||
@@ -371,8 +371,12 @@ KAsync::Job<void> Synchronizer::processRequest(const SyncRequest &request) | |||
371 | 371 | ||
372 | KAsync::Job<void> Synchronizer::processSyncQueue() | 372 | KAsync::Job<void> Synchronizer::processSyncQueue() |
373 | { | 373 | { |
374 | if (mSyncRequestQueue.isEmpty() || mSyncInProgress) { | 374 | if (mSyncRequestQueue.isEmpty()) { |
375 | SinkTraceCtx(mLogCtx) << "Sync still in progress or nothing to do."; | 375 | SinkLogCtx(mLogCtx) << "All requests processed."; |
376 | return KAsync::null<void>(); | ||
377 | } | ||
378 | if (mSyncInProgress) { | ||
379 | SinkTraceCtx(mLogCtx) << "Sync still in progress."; | ||
376 | return KAsync::null<void>(); | 380 | return KAsync::null<void>(); |
377 | } | 381 | } |
378 | //Don't process any new requests until we're done with the pending ones. | 382 | //Don't process any new requests until we're done with the pending ones. |
@@ -485,7 +489,7 @@ KAsync::Job<void> Synchronizer::replay(const QByteArray &type, const QByteArray | |||
485 | oldRemoteId = syncStore().resolveLocalId(type, uid); | 489 | oldRemoteId = syncStore().resolveLocalId(type, uid); |
486 | //oldRemoteId can be empty if the resource implementation didn't return a remoteid | 490 | //oldRemoteId can be empty if the resource implementation didn't return a remoteid |
487 | } | 491 | } |
488 | SinkTraceCtx(mLogCtx) << "Replaying " << key << type << uid << oldRemoteId; | 492 | SinkLogCtx(mLogCtx) << "Replaying: " << key << "Type: " << type << "Uid: " << uid << "Rid: " << oldRemoteId << "Revision: " << metadataBuffer->revision(); |
489 | 493 | ||
490 | KAsync::Job<QByteArray> job = KAsync::null<QByteArray>(); | 494 | KAsync::Job<QByteArray> job = KAsync::null<QByteArray>(); |
491 | //TODO This requires supporting every domain type here as well. Can we solve this better so we can do the dispatch somewhere centrally? | 495 | //TODO This requires supporting every domain type here as well. Can we solve this better so we can do the dispatch somewhere centrally? |