aboutsummaryrefslogtreecommitdiff
path: root/zenserver/cache/structuredcache.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'zenserver/cache/structuredcache.cpp')
-rw-r--r--zenserver/cache/structuredcache.cpp80
1 files changed, 38 insertions, 42 deletions
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index b2f8d191c..9600c5f8a 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -4,6 +4,7 @@
#include <zencore/compactbinaryvalidation.h>
#include <zencore/compress.h>
#include <zencore/fmtutils.h>
+#include <zencore/logging.h>
#include <zencore/timer.h>
#include <zenhttp/httpserver.h>
@@ -14,7 +15,6 @@
#include "upstream/zen.h"
#include "zenstore/cidstore.h"
-#include <spdlog/spdlog.h>
#include <algorithm>
#include <atomic>
#include <filesystem>
@@ -31,18 +31,18 @@ HttpStructuredCacheService::HttpStructuredCacheService(::ZenCacheStore& InC
zen::CasStore& InStore,
zen::CidStore& InCidStore,
std::unique_ptr<UpstreamCache> UpstreamCache)
-: m_Log("cache", begin(spdlog::default_logger()->sinks()), end(spdlog::default_logger()->sinks()))
+: m_Log(zen::logging::Get("cache"))
, m_CacheStore(InCacheStore)
, m_CasStore(InStore)
, m_CidStore(InCidStore)
, m_UpstreamCache(std::move(UpstreamCache))
{
- m_Log.set_level(spdlog::level::debug);
+ // m_Log.set_level(spdlog::level::debug);
}
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)
{
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-15 09:23:29 +0000