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.hpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/buildtool/execution_api/execution_service/ac_server.hpp') diff --git a/src/buildtool/execution_api/execution_service/ac_server.hpp b/src/buildtool/execution_api/execution_service/ac_server.hpp index d862c5da..3072c70a 100644 --- a/src/buildtool/execution_api/execution_service/ac_server.hpp +++ b/src/buildtool/execution_api/execution_service/ac_server.hpp @@ -19,10 +19,16 @@ #include "gsl/gsl" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/logging/logger.hpp" +#include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/storage.hpp" class ActionCacheServiceImpl final : public bazel_re::ActionCache::Service { public: + explicit ActionCacheServiceImpl( + gsl::not_null const& storage_config, + gsl::not_null const& storage) noexcept + : storage_config_{*storage_config}, storage_{*storage} {} + // Retrieve a cached execution result. // // Implementations SHOULD ensure that any blobs referenced from the @@ -61,7 +67,8 @@ class ActionCacheServiceImpl final : public bazel_re::ActionCache::Service { ::bazel_re::ActionResult* response) -> ::grpc::Status override; private: - gsl::not_null storage_ = &Storage::Instance(); + StorageConfig const& storage_config_; + Storage const& storage_; Logger logger_{"execution-service"}; }; -- cgit v1.2.3