log cleanup (#969)

- Improvement: New `ZEN_SCOPED_LOG(Expr)` macro routes `ZEN_INFO`/`ZEN_WARN`/`ZEN_DEBUG` in the enclosing block through the given logger expression instead of the default
- Improvement: `BuildContainer`, `SaveOplog`, and `LoadOplogContext` now take a caller-provided `LoggerRef` so diagnostic messages route through the caller's logger

1 files changed, 7 insertions, 7 deletions

diff --git a/src/zenstore/cache/cachedisklayer.cpp b/src/zenstore/cache/cachedisklayer.cpp
index 4640309d9..45a4b6456 100644
--- a/src/zenstore/cache/cachedisklayer.cpp
+++ b/src/zenstore/cache/cachedisklayer.cpp
@@ -3083,7 +3083,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Z$::Bucket::CompactStore");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -3338,7 +3338,7 @@ ZenCacheDiskLayer::CacheBucket::RemoveExpiredData(GcCtx& Ctx, GcStats& Stats)
 {
 	ZEN_TRACE_CPU("Z$::Bucket::RemoveExpiredData");
 
-	auto Log = [&Ctx]() { return Ctx.Logger; };
+	ZEN_SCOPED_LOG(Ctx.Logger);
 
 	size_t TotalEntries = 0;
 
@@ -3502,7 +3502,7 @@ ZenCacheDiskLayer::CacheBucket::GetReferences(const LoggerRef&	   Logger,
 {
 	ZEN_TRACE_CPU("Z$::Bucket::GetReferencesLocked");
 
-	auto Log = [&Logger]() { return Logger; };
+	ZEN_SCOPED_LOG(Logger);
 
 	auto GetAttachments = [&](const IoHash& RawHash, MemoryView Data) -> bool {
 		if (CbValidateError Error = ValidateCompactBinary(Data, CbValidateMode::Default); Error == CbValidateError::None)
@@ -3718,7 +3718,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Z$::Bucket::PreCache");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -3753,7 +3753,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Z$::Bucket::UpdateLockedState");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		Stopwatch  Timer;
 		const auto _ = MakeGuard([&] {
@@ -3784,7 +3784,7 @@ public:
 	{
 		ZEN_TRACE_CPU("Z$::Bucket::GetUnusedReferences");
 
-		auto Log = [&Ctx]() { return Ctx.Logger; };
+		ZEN_SCOPED_LOG(Ctx.Logger);
 
 		const size_t InitialCount = IoCids.size();
 		size_t		 UsedCount	  = InitialCount;
@@ -3818,7 +3818,7 @@ ZenCacheDiskLayer::CacheBucket::CreateReferenceCheckers(GcCtx& Ctx)
 {
 	ZEN_TRACE_CPU("Z$::Bucket::CreateReferenceCheckers");
 
-	auto Log = [&Ctx]() { return Ctx.Logger; };
+	ZEN_SCOPED_LOG(Ctx.Logger);
 
 	Stopwatch  Timer;
 	const auto _ = MakeGuard([&] {