1 files changed, 8 insertions, 5 deletions

diff --git a/common/changereplay.cpp b/common/changereplay.cpp
index 532cca8..7895b66 100644
--- a/common/changereplay.cpp
+++ b/common/changereplay.cpp
@@ -29,10 +29,10 @@
 using namespace Sink;
 using namespace Sink::Storage;
 
-ChangeReplay::ChangeReplay(const ResourceContext &resourceContext)
-    : mStorage(storageLocation(), resourceContext.instanceId(), DataStore::ReadOnly), mChangeReplayStore(storageLocation(), resourceContext.instanceId() + ".changereplay", DataStore::ReadWrite), mReplayInProgress(false), mLogCtx{"changereplay"}
+ChangeReplay::ChangeReplay(const ResourceContext &resourceContext, const Sink::Log::Context &ctx)
+    : mStorage(storageLocation(), resourceContext.instanceId(), DataStore::ReadOnly), mChangeReplayStore(storageLocation(), resourceContext.instanceId() + ".changereplay", DataStore::ReadWrite), mReplayInProgress(false), mLogCtx{ctx.subContext("changereplay")},
+    mGuard{new QObject}
 {
-    SinkTraceCtx(mLogCtx) << "Created change replay: " << resourceContext.instanceId();
 }
 
 qint64 ChangeReplay::getLastReplayedRevision()
@@ -54,7 +54,6 @@ bool ChangeReplay::allChangesReplayed()
         SinkWarningCtx(mLogCtx) << error.message;
     }));
     const qint64 lastReplayedRevision = getLastReplayedRevision();
-    SinkTraceCtx(mLogCtx) << "Checking if all replayed. Top revision:" << topRevision << "Last replayed:" << lastReplayedRevision;
     return (lastReplayedRevision >= topRevision);
 }
 
@@ -99,8 +98,12 @@ KAsync::Job<void> ChangeReplay::replayNextRevision()
             SinkTraceCtx(mLogCtx) << "Changereplay from " << *lastReplayedRevision << " to " << *topRevision;
             return KAsync::doWhile(
                 [this, lastReplayedRevision, topRevision]() -> KAsync::Job<KAsync::ControlFlowFlag> {
+                    if (!mGuard) {
+                        SinkTraceCtx(mLogCtx) << "Exit due to guard";
+                        return KAsync::value(KAsync::Break);
+                    }
                     if (*lastReplayedRevision >= *topRevision) {
-                        SinkTraceCtx(mLogCtx) << "Done replaying";
+                        SinkTraceCtx(mLogCtx) << "Done replaying" << *lastReplayedRevision << *topRevision;
                         return KAsync::value(KAsync::Break);
                     }