aboutsummaryrefslogtreecommitdiff
path: root/zenserver/cache
diff options
context:
space:
mode:
Diffstat (limited to 'zenserver/cache')
-rw-r--r--zenserver/cache/cachestore.cpp16
-rw-r--r--zenserver/cache/structuredcache.cpp74
-rw-r--r--zenserver/cache/structuredcachestore.cpp6
3 files changed, 46 insertions, 50 deletions
diff --git a/zenserver/cache/cachestore.cpp b/zenserver/cache/cachestore.cpp
index 44aa4c892..2fc253a07 100644
--- a/zenserver/cache/cachestore.cpp
+++ b/zenserver/cache/cachestore.cpp
@@ -85,7 +85,7 @@ FileCacheStore::FileCacheStore(const char* RootDir, const char* ReadRootDir)
{
// Ensure root directory exists - create if it doesn't exist already
- spdlog::info("Initializing FileCacheStore at '{}'", std::string_view(RootDir));
+ ZEN_INFO("Initializing FileCacheStore at '{}'", std::string_view(RootDir));
m_RootDir = RootDir;
@@ -98,7 +98,7 @@ FileCacheStore::FileCacheStore(const char* RootDir, const char* ReadRootDir)
ExtendableStringBuilder<256> Name;
WideToUtf8(m_RootDir.c_str(), Name);
- spdlog::error("Could not open file cache directory '{}' for writing ({})", Name.c_str(), ErrorCode.message());
+ ZEN_ERROR("Could not open file cache directory '{}' for writing ({})", Name.c_str(), ErrorCode.message());
m_IsOk = false;
}
@@ -109,7 +109,7 @@ FileCacheStore::FileCacheStore(const char* RootDir, const char* ReadRootDir)
if (std::filesystem::exists(m_ReadRootDir, ErrorCode))
{
- spdlog::info("FileCacheStore will use additional read tree at '{}'", std::string_view(ReadRootDir));
+ ZEN_INFO("FileCacheStore will use additional read tree at '{}'", std::string_view(ReadRootDir));
m_ReadRootIsValid = true;
}
@@ -145,7 +145,7 @@ FileCacheStore::Get(std::string_view Key, CacheValue& OutValue)
if (FAILED(hRes))
{
- spdlog::debug("GET MISS {}", Key);
+ ZEN_DEBUG("GET MISS {}", Key);
return false;
}
@@ -162,7 +162,7 @@ FileCacheStore::Get(std::string_view Key, CacheValue& OutValue)
OutValue.Value = IoBuffer(IoBuffer::File, File.Detach(), 0, FileSize);
- spdlog::debug("GET HIT {}", Key);
+ ZEN_DEBUG("GET HIT {}", Key);
return true;
}
@@ -180,7 +180,7 @@ FileCacheStore::Put(std::string_view Key, const CacheValue& Value)
CAtlTemporaryFile File;
- spdlog::debug("PUT {}", Key);
+ ZEN_DEBUG("PUT {}", Key);
HRESULT hRes = File.Create(m_RootDir.c_str());
@@ -205,11 +205,11 @@ FileCacheStore::Put(std::string_view Key, const CacheValue& Value)
if (FAILED(hRes))
{
- spdlog::warn("Failed to rename temp file for key '{}' - deleting temporary file", Key);
+ ZEN_WARN("Failed to rename temp file for key '{}' - deleting temporary file", Key);
if (!DeleteFile(File.TempFileName()))
{
- spdlog::warn("Temp file for key '{}' could not be deleted - no value persisted", Key);
+ ZEN_WARN("Temp file for key '{}' could not be deleted - no value persisted", Key);
}
}
}
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 196a4b66c..9600c5f8a 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -42,7 +42,7 @@ HttpStructuredCacheService::HttpStructuredCacheService(::ZenCacheStore& InC
HttpStructuredCacheService::~HttpStructuredCacheService()
{
- spdlog::info("closing structured cache");
+ ZEN_INFO("closing structured cache");
}
const char*
@@ -173,7 +173,7 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
{
Value.Value = IoBuffer();
Success = false;
- m_Log.warn("Upstream cache record '{}/{}' failed validation", Ref.BucketSegment, Ref.HashKey);
+ ZEN_WARN("Upstream cache record '{}/{}' failed validation", Ref.BucketSegment, Ref.HashKey);
}
}
@@ -186,7 +186,7 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
if (!Success)
{
- m_Log.debug("MISS - '{}/{}'", Ref.BucketSegment, Ref.HashKey);
+ ZEN_DEBUG("MISS - '{}/{}'", Ref.BucketSegment, Ref.HashKey);
return Request.WriteResponse(zen::HttpResponseCode::NotFound);
}
@@ -196,12 +196,12 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
Request.SetSuppressResponseBody();
}
- m_Log.debug("HIT - '{}/{}' ({} bytes {}) ({})",
- Ref.BucketSegment,
- Ref.HashKey,
- Value.Value.Size(),
- Value.Value.GetContentType(),
- InUpstreamCache ? "upstream" : "local");
+ ZEN_DEBUG("HIT - '{}/{}' ({} bytes {}) ({})",
+ Ref.BucketSegment,
+ Ref.HashKey,
+ Value.Value.Size(),
+ Value.Value.GetContentType(),
+ InUpstreamCache ? "upstream" : "local");
return Request.WriteResponse(zen::HttpResponseCode::OK, Value.Value.GetContentType(), Value.Value);
}
@@ -239,11 +239,7 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
{
// TODO: create a cache record and put value in CAS?
m_CacheStore.Put(Ref.BucketSegment, Ref.HashKey, {.Value = Body});
- m_Log.debug("PUT (binary) - '{}/{}' ({} bytes, {})",
- Ref.BucketSegment,
- Ref.HashKey,
- Body.Size(),
- Body.GetContentType());
+ ZEN_DEBUG("PUT (binary) - '{}/{}' ({} bytes, {})", Ref.BucketSegment, Ref.HashKey, Body.Size(), Body.GetContentType());
if (m_UpstreamCache)
{
@@ -260,7 +256,7 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
if (ValidationResult != CbValidateError::None)
{
- m_Log.warn("Payload for key '{}/{}' ({} bytes) failed validation", Ref.BucketSegment, Ref.HashKey, Body.Size());
+ ZEN_WARN("Payload for key '{}/{}' ({} bytes) failed validation", Ref.BucketSegment, Ref.HashKey, Body.Size());
// TODO: add details in response, kText || kCbObject?
return Request.WriteResponse(HttpResponseCode::BadRequest,
@@ -299,13 +295,13 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
m_CacheStore.Put(Ref.BucketSegment, Ref.HashKey, CacheValue);
- m_Log.debug("PUT (cache record) - '{}/{}' ({} bytes, {}, ({}/{} refs/missing))",
- Ref.BucketSegment,
- Ref.HashKey,
- CacheValue.Value.Size(),
- CacheValue.Value.GetContentType(),
- References.size(),
- MissingRefs.size());
+ ZEN_DEBUG("PUT (cache record) - '{}/{}' ({} bytes, {}, ({}/{} refs/missing))",
+ Ref.BucketSegment,
+ Ref.HashKey,
+ CacheValue.Value.Size(),
+ CacheValue.Value.GetContentType(),
+ References.size(),
+ MissingRefs.size());
if (MissingRefs.empty())
{
@@ -327,7 +323,7 @@ HttpStructuredCacheService::HandleCacheRecordRequest(zen::HttpServerRequest& Req
for (const IoHash& MissingRef : MissingRefs)
{
Response.AddHash(MissingRef);
- m_Log.debug("cache record '{}/{}' is missing reference '{}'", Ref.BucketSegment, Ref.HashKey, MissingRef);
+ ZEN_DEBUG("cache record '{}/{}' is missing reference '{}'", Ref.BucketSegment, Ref.HashKey, MissingRef);
}
Response.EndArray();
@@ -380,24 +376,24 @@ HttpStructuredCacheService::HandleCachePayloadRequest(zen::HttpServerRequest& Re
}
else
{
- m_Log.warn("got uncompressed upstream cache payload");
+ ZEN_WARN("got uncompressed upstream cache payload");
}
}
}
if (!Payload)
{
- m_Log.debug("MISS - '{}/{}/{}'", Ref.BucketSegment, Ref.HashKey, Ref.PayloadId);
+ ZEN_DEBUG("MISS - '{}/{}/{}'", Ref.BucketSegment, Ref.HashKey, Ref.PayloadId);
return Request.WriteResponse(zen::HttpResponseCode::NotFound);
}
- m_Log.debug("HIT - '{}/{}/{}' ({} bytes, {}) ({})",
- Ref.BucketSegment,
- Ref.HashKey,
- Ref.PayloadId,
- Payload.Size(),
- Payload.GetContentType(),
- InUpstreamCache ? "upstream" : "local");
+ ZEN_DEBUG("HIT - '{}/{}/{}' ({} bytes, {}) ({})",
+ Ref.BucketSegment,
+ Ref.HashKey,
+ Ref.PayloadId,
+ Payload.Size(),
+ Payload.GetContentType(),
+ InUpstreamCache ? "upstream" : "local");
if (Verb == kHead)
{
@@ -442,13 +438,13 @@ HttpStructuredCacheService::HandleCachePayloadRequest(zen::HttpServerRequest& Re
m_CidStore.AddCompressedCid(Ref.PayloadId, ChunkHash);
- m_Log.debug("PUT ({}) - '{}/{}/{}' ({} bytes, {})",
- Result.New ? "NEW" : "OLD",
- Ref.BucketSegment,
- Ref.HashKey,
- Ref.PayloadId,
- Body.Size(),
- Body.GetContentType());
+ ZEN_DEBUG("PUT ({}) - '{}/{}/{}' ({} bytes, {})",
+ Result.New ? "NEW" : "OLD",
+ Ref.BucketSegment,
+ Ref.HashKey,
+ Ref.PayloadId,
+ Body.Size(),
+ Body.GetContentType());
if (Result.New)
{
diff --git a/zenserver/cache/structuredcachestore.cpp b/zenserver/cache/structuredcachestore.cpp
index 8c4bb65bb..018955e65 100644
--- a/zenserver/cache/structuredcachestore.cpp
+++ b/zenserver/cache/structuredcachestore.cpp
@@ -31,7 +31,7 @@ using namespace fmt::literals;
ZenCacheStore::ZenCacheStore(zen::CasStore& Cas, const std::filesystem::path& RootDir) : m_DiskLayer{Cas, RootDir}
{
- spdlog::info("initializing structured cache at '{}'", RootDir);
+ ZEN_INFO("initializing structured cache at '{}'", RootDir);
zen::CreateDirectories(RootDir);
}
@@ -85,7 +85,7 @@ ZenCacheStore::Put(std::string_view InBucket, const zen::IoHash& HashKey, const
bool
ZenCacheStore::DropBucket(std::string_view Bucket)
{
- spdlog::info("dropping bucket '{}'", Bucket);
+ ZEN_INFO("dropping bucket '{}'", Bucket);
// TODO: should ensure this is done atomically across all layers
@@ -93,7 +93,7 @@ ZenCacheStore::DropBucket(std::string_view Bucket)
const bool DiskDropped = m_DiskLayer.DropBucket(Bucket);
const bool AnyDropped = MemDropped || DiskDropped;
- spdlog::info("bucket '{}' was {}", Bucket, AnyDropped ? "dropped" : "not found");
+ ZEN_INFO("bucket '{}' was {}", Bucket, AnyDropped ? "dropped" : "not found");
return AnyDropped;
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-23 12:09:35 +0000