move gc logs to gc logger (#142)

- Improvement: Move GC logging in callback functions into "gc" context

1 files changed, 48 insertions, 10 deletions

diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index c1905228c..984b749d0 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -2886,7 +2886,6 @@ ProjectStore::Project::OpenOplog(std::string_view OplogId, bool AllowCompact)
 	{
 		return It->second.get();
 	}
-
 	if (Oplog::ExistsAt(OplogBasePath))
 	{
 		try
@@ -5003,6 +5002,8 @@ public:
 	{
 		ZEN_TRACE_CPU("Store::CompactStore");
 
+		auto Log = [&Ctx]() { return Ctx.Logger; };
+
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
 			if (!Ctx.Settings.Verbose)
@@ -5125,6 +5126,8 @@ ProjectStore::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats)
 {
 	ZEN_TRACE_CPU("Store::RemoveExpiredData");
 
+	auto Log = [&Ctx]() { return Ctx.Logger; };
+
 	Stopwatch  Timer;
 	const auto _ = MakeGuard([&] {
 		if (!Ctx.Settings.Verbose)
@@ -5266,6 +5269,8 @@ public:
 	{
 		ZEN_TRACE_CPU("Store::UpdateLockedState");
 
+		auto Log = [&Ctx]() { return Ctx.Logger; };
+
 		Stopwatch Timer;
 
 		std::vector<ProjectStore::Oplog*> AddedOplogs;
@@ -5334,6 +5339,8 @@ public:
 	{
 		ZEN_TRACE_CPU("Store::RemoveUsedReferencesFromSet");
 
+		auto Log = [&Ctx]() { return Ctx.Logger; };
+
 		size_t	   InitialCount = IoCids.size();
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -5404,6 +5411,8 @@ public:
 	{
 		ZEN_TRACE_CPU("Store::Oplog::PreCache");
 
+		auto Log = [&Ctx]() { return Ctx.Logger; };
+
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
 			if (!Ctx.Settings.Verbose)
@@ -5464,6 +5473,8 @@ public:
 	{
 		ZEN_TRACE_CPU("Store::Oplog::UpdateLockedState");
 
+		auto Log = [&Ctx]() { return Ctx.Logger; };
+
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
 			if (!Ctx.Settings.Verbose)
@@ -5503,6 +5514,8 @@ public:
 	{
 		ZEN_TRACE_CPU("Store::Oplog::RemoveUsedReferencesFromSet");
 
+		auto Log = [&Ctx]() { return Ctx.Logger; };
+
 		size_t	   InitialCount = IoCids.size();
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -5544,6 +5557,8 @@ ProjectStore::CreateReferenceCheckers(GcCtx& Ctx)
 {
 	ZEN_TRACE_CPU("Store::CreateReferenceCheckers");
 
+	auto Log = [&Ctx]() { return Ctx.Logger; };
+
 	size_t ProjectCount = 0;
 	size_t OplogCount	= 0;
 
@@ -5602,9 +5617,12 @@ ProjectStore::CreateReferenceCheckers(GcCtx& Ctx)
 }
 
 std::vector<RwLock::SharedLockScope>
-ProjectStore::LockState(GcCtx&)
+ProjectStore::LockState(GcCtx& Ctx)
 {
 	ZEN_TRACE_CPU("Store::LockState");
+
+	auto Log = [&Ctx]() { return Ctx.Logger; };
+
 	std::vector<RwLock::SharedLockScope> Locks;
 	Locks.emplace_back(RwLock::SharedLockScope(m_ProjectsLock));
 	for (auto& ProjectIt : m_Projects)
@@ -5846,20 +5864,40 @@ TEST_CASE_TEMPLATE("project.store.export",
 	ProjectStore::Oplog* OplogImport = Project->NewOplog("oplog2", {});
 	CHECK(OplogImport != nullptr);
 
-	RemoteProjectStore::Result ImportResult =
-		LoadOplog(CidStore, *RemoteStore, *OplogImport, /*Force*/ false, /*IgnoreMissingAttachments*/ false, /*CleanOplog*/ false, nullptr);
+	RemoteProjectStore::Result ImportResult = LoadOplog(CidStore,
+														*RemoteStore,
+														*OplogImport,
+														/*Force*/ false,
+														/*IgnoreMissingAttachments*/ false,
+														/*CleanOplog*/ false,
+														nullptr);
 	CHECK(ImportResult.ErrorCode == 0);
 
-	RemoteProjectStore::Result ImportForceResult =
-		LoadOplog(CidStore, *RemoteStore, *OplogImport, /*Force*/ true, /*IgnoreMissingAttachments*/ false, /*CleanOplog*/ false, nullptr);
+	RemoteProjectStore::Result ImportForceResult = LoadOplog(CidStore,
+															 *RemoteStore,
+															 *OplogImport,
+															 /*Force*/ true,
+															 /*IgnoreMissingAttachments*/ false,
+															 /*CleanOplog*/ false,
+															 nullptr);
 	CHECK(ImportForceResult.ErrorCode == 0);
 
-	RemoteProjectStore::Result ImportCleanResult =
-		LoadOplog(CidStore, *RemoteStore, *OplogImport, /*Force*/ false, /*IgnoreMissingAttachments*/ false, /*CleanOplog*/ true, nullptr);
+	RemoteProjectStore::Result ImportCleanResult = LoadOplog(CidStore,
+															 *RemoteStore,
+															 *OplogImport,
+															 /*Force*/ false,
+															 /*IgnoreMissingAttachments*/ false,
+															 /*CleanOplog*/ true,
+															 nullptr);
 	CHECK(ImportCleanResult.ErrorCode == 0);
 
-	RemoteProjectStore::Result ImportForceCleanResult =
-		LoadOplog(CidStore, *RemoteStore, *OplogImport, /*Force*/ true, /*IgnoreMissingAttachments*/ false, /*CleanOplog*/ true, nullptr);
+	RemoteProjectStore::Result ImportForceCleanResult = LoadOplog(CidStore,
+																  *RemoteStore,
+																  *OplogImport,
+																  /*Force*/ true,
+																  /*IgnoreMissingAttachments*/ false,
+																  /*CleanOplog*/ true,
+																  nullptr);
 	CHECK(ImportForceCleanResult.ErrorCode == 0);
 }