From 0d8a4ad15b93283cc31787b039051b9e9a285ba8 Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Thu, 27 Jun 2024 12:36:22 +0200 Subject: Pass StorageConfig and Storage to ServerImpl --- src/buildtool/execution_api/execution_service/ac_server.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/buildtool/execution_api/execution_service/ac_server.cpp') diff --git a/src/buildtool/execution_api/execution_service/ac_server.cpp b/src/buildtool/execution_api/execution_service/ac_server.cpp index 8b0a216e..83b95c7f 100644 --- a/src/buildtool/execution_api/execution_service/ac_server.cpp +++ b/src/buildtool/execution_api/execution_service/ac_server.cpp @@ -16,7 +16,6 @@ #include "fmt/core.h" #include "src/buildtool/logging/log_level.hpp" -#include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/utils/cpp/verify_hash.hpp" @@ -31,13 +30,13 @@ auto ActionCacheServiceImpl::GetActionResult( logger_.Emit(LogLevel::Trace, "GetActionResult: {}", request->action_digest().hash()); - auto lock = GarbageCollector::SharedLock(StorageConfig::Instance()); + auto lock = GarbageCollector::SharedLock(storage_config_); if (!lock) { auto str = fmt::format("Could not acquire SharedLock"); logger_.Emit(LogLevel::Error, str); return grpc::Status{grpc::StatusCode::INTERNAL, str}; } - auto x = storage_->ActionCache().CachedResult(request->action_digest()); + auto x = storage_.ActionCache().CachedResult(request->action_digest()); if (!x) { return grpc::Status{ grpc::StatusCode::NOT_FOUND, -- cgit v1.2.3