logging cleanup

1 files changed, 15 insertions, 11 deletions

diff --git a/zenstore/compactcas.cpp b/zenstore/compactcas.cpp
index 3cb7d8854..c2ca5b78f 100644
--- a/zenstore/compactcas.cpp
+++ b/zenstore/compactcas.cpp
@@ -184,7 +184,7 @@ namespace {
 		{
 			Stopwatch  Timer;
 			const auto _ = MakeGuard([RootDirectory, ContainerBaseName, &Entries, &Timer] {
-				ZEN_INFO("read store {} index containing {} entries in {}",
+				ZEN_INFO("read store '{}' index containing {} entries in {}",
 						 RootDirectory / ContainerBaseName,
 						 Entries.size(),
 						 NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
@@ -272,7 +272,7 @@ namespace {
 		{
 			Stopwatch  Timer;
 			const auto _ = MakeGuard([RootDirectory, ContainerBaseName, &Entries, &Timer] {
-				ZEN_INFO("read store {} log containing {} entries in {}",
+				ZEN_INFO("read store '{}' log containing {} entries in {}",
 						 RootDirectory / ContainerBaseName,
 						 Entries.size(),
 						 NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
@@ -292,7 +292,7 @@ namespace {
 													 bool											   CleanSource,
 													 const std::unordered_set<IoHash, IoHash::Hasher>& ExistingChunks)
 	{
-		ZEN_INFO("migrating store {}", RootPath / ContainerBaseName);
+		ZEN_INFO("migrating store '{}'", RootPath / ContainerBaseName);
 
 		std::filesystem::path BlocksBasePath = GetBlocksBasePath(RootPath, ContainerBaseName);
 		std::filesystem::path LegacyLogPath	 = GetLegacyLogPath(RootPath, ContainerBaseName);
@@ -305,7 +305,7 @@ namespace {
 		Stopwatch  MigrationTimer;
 		uint64_t   TotalSize = 0;
 		const auto _ = MakeGuard([RootPath, ContainerBaseName, &MigrationTimer, &MigratedChunkCount, &MigratedBlockCount, &TotalSize] {
-			ZEN_INFO("migrated store {} to {} chunks in {} blocks in {} ({})",
+			ZEN_INFO("migrated store '{}' to {} chunks in {} blocks in {} ({})",
 					 RootPath / ContainerBaseName,
 					 MigratedChunkCount,
 					 MigratedBlockCount,
@@ -349,7 +349,7 @@ namespace {
 		{
 			Stopwatch  Timer;
 			const auto __ = MakeGuard([RootPath, ContainerBaseName, &LegacyDiskIndex, &Timer] {
-				ZEN_INFO("read store {} legacy index containing {} entries in {}",
+				ZEN_INFO("read store '{}' legacy index containing {} entries in {}",
 						 RootPath / ContainerBaseName,
 						 LegacyDiskIndex.size(),
 						 NiceTimeSpanMs(Timer.GetElapsedTimeMs()));
@@ -363,7 +363,7 @@ namespace {
 				}
 				if (!ValidateLegacyEntry(Record, InvalidEntryReason))
 				{
-					ZEN_WARN("skipping invalid entry in {}, {}", LegacyLogPath, InvalidEntryReason);
+					ZEN_WARN("skipping invalid entry in '{}', '{}'", LegacyLogPath, InvalidEntryReason);
 					return;
 				}
 				uint64_t EntryEnd = Record.Location.GetOffset() + Record.Location.GetSize();
@@ -413,7 +413,7 @@ namespace {
 		{
 			if (Space.Free < (MaxBlockSize + (1 << 28)))
 			{
-				ZEN_INFO("legacy store migration from {} aborted, not enough disk space available {} ({})",
+				ZEN_INFO("legacy store migration from '{}' aborted, not enough disk space available {} ({})",
 						 RootPath / ContainerBaseName,
 						 NewBlockIndex + 1,
 						 NiceBytes(MaxBlockSize + (1 << 28)),
@@ -425,7 +425,7 @@ namespace {
 		{
 			if (Space.Free < (RequiredDiskSpace + (1 << 28)))
 			{
-				ZEN_INFO("legacy store migration from {} aborted, not enough disk space available {} ({})",
+				ZEN_INFO("legacy store migration from '{}' aborted, not enough disk space available {} ({})",
 						 RootPath / ContainerBaseName,
 						 NewBlockIndex + 1,
 						 NiceBytes(RequiredDiskSpace + (1 << 28)),
@@ -540,7 +540,7 @@ namespace {
 					uint64_t Completed = BlockOffset + BlockSize - Remaining;
 					uint64_t ETA	   = (WriteBlockTimer.GetElapsedTimeMs() * Remaining) / Completed;
 
-					ZEN_INFO("migrating store {} {}/{} blocks, remaining {} ({}) ETA: {}",
+					ZEN_INFO("migrating store '{}' {}/{} blocks, remaining {} ({}) ETA: {}",
 							 RootPath / ContainerBaseName,
 							 Idx,
 							 BlockRanges.size(),
@@ -1461,7 +1461,9 @@ CasContainerStrategy::OpenContainer(bool IsNewStore)
 		{
 			if (!ValidateEntry(Entry, InvalidEntryReason))
 			{
-				ZEN_WARN("skipping invalid entry in {}, {}", GetIndexPath(m_Config.RootDirectory, m_ContainerBaseName), InvalidEntryReason);
+				ZEN_WARN("skipping invalid entry in '{}', '{}'",
+						 GetIndexPath(m_Config.RootDirectory, m_ContainerBaseName),
+						 InvalidEntryReason);
 				continue;
 			}
 			m_LocationMap[Entry.Key] = Entry.Location;
@@ -1481,7 +1483,9 @@ CasContainerStrategy::OpenContainer(bool IsNewStore)
 			}
 			if (!ValidateEntry(Entry, InvalidEntryReason))
 			{
-				ZEN_WARN("skipping invalid entry in {}, {}", GetLogPath(m_Config.RootDirectory, m_ContainerBaseName), InvalidEntryReason);
+				ZEN_WARN("skipping invalid entry in '{}', '{}'",
+						 GetLogPath(m_Config.RootDirectory, m_ContainerBaseName),
+						 InvalidEntryReason);
 				continue;
 			}
 			m_LocationMap[Entry.Key] = Entry.Location;