diff options
Diffstat (limited to 'src/buildtool/serve_api/serve_service/source_tree.cpp')
| -rw-r--r-- | src/buildtool/serve_api/serve_service/source_tree.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/buildtool/serve_api/serve_service/source_tree.cpp b/src/buildtool/serve_api/serve_service/source_tree.cpp index 9544a407..62e9bf0d 100644 --- a/src/buildtool/serve_api/serve_service/source_tree.cpp +++ b/src/buildtool/serve_api/serve_service/source_tree.cpp @@ -32,7 +32,6 @@ #include "src/buildtool/file_system/git_repo.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/multithreading/async_map_utils.hpp" -#include "src/buildtool/serve_api/remote/config.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/fs_utils.hpp" #include "src/buildtool/storage/garbage_collector.hpp" @@ -256,7 +255,7 @@ auto SourceTreeService::ServeCommitTree( return ::grpc::Status::OK; } // try given extra repositories, in order - for (auto const& path : RemoteServeConfig::Instance().KnownRepositories()) { + for (auto const& path : serve_config_.KnownRepositories()) { auto res = GetSubtreeFromCommit(path, commit, subdir, logger_); if (std::holds_alternative<std::string>(res)) { auto tree_id = std::get<std::string>(res); @@ -412,7 +411,7 @@ auto SourceTreeService::ResolveContentTree( ResolvedGitObject resolved_tree{}; bool failed{false}; { - TaskSystem ts{RemoteServeConfig::Instance().Jobs()}; + TaskSystem ts{serve_config_.Jobs()}; resolve_symlinks_map_.ConsumeAfterKeysReady( &ts, {GitObjectToResolve{tree_id, @@ -747,8 +746,7 @@ auto SourceTreeService::ServeArchiveTree( return ::grpc::Status::OK; } // check known repositories - for (auto const& path : - RemoteServeConfig::Instance().KnownRepositories()) { + for (auto const& path : serve_config_.KnownRepositories()) { auto res = GetSubtreeFromTree(path, *archive_tree_id, subdir, logger_); if (std::holds_alternative<std::string>(res)) { @@ -809,8 +807,7 @@ auto SourceTreeService::ServeArchiveTree( } if (not content_cas_path) { // check if content blob is in a known repository - for (auto const& path : - RemoteServeConfig::Instance().KnownRepositories()) { + for (auto const& path : serve_config_.KnownRepositories()) { auto res = GetBlobFromRepo(path, content, logger_); if (std::holds_alternative<std::string>(res)) { // add to CAS @@ -1055,8 +1052,7 @@ auto SourceTreeService::ServeDistdirTree( return ::grpc::Status::OK; } // check known repositories - for (auto const& path : - RemoteServeConfig::Instance().KnownRepositories()) { + for (auto const& path : serve_config_.KnownRepositories()) { auto res = GetBlobFromRepo(path, content, logger_); if (std::holds_alternative<std::string>(res)) { // add content to local CAS @@ -1219,7 +1215,7 @@ auto SourceTreeService::ServeDistdirTree( return ::grpc::Status::OK; } // check if tree is in a known repository - for (auto const& path : RemoteServeConfig::Instance().KnownRepositories()) { + for (auto const& path : serve_config_.KnownRepositories()) { auto has_tree = IsTreeInRepo(tree_id, path, logger_); if (not has_tree) { logger_->Emit(LogLevel::Error, @@ -1325,7 +1321,7 @@ auto SourceTreeService::ServeContent( return ::grpc::Status::OK; } // check if content blob is in a known repository - for (auto const& path : RemoteServeConfig::Instance().KnownRepositories()) { + for (auto const& path : serve_config_.KnownRepositories()) { auto res = GetBlobFromRepo(path, content, logger_); if (std::holds_alternative<std::string>(res)) { // upload blob to remote CAS @@ -1442,7 +1438,7 @@ auto SourceTreeService::ServeTree( return ::grpc::Status::OK; } // check if tree is in a known repository - for (auto const& path : RemoteServeConfig::Instance().KnownRepositories()) { + for (auto const& path : serve_config_.KnownRepositories()) { auto has_tree = IsTreeInRepo(tree_id, path, logger_); if (not has_tree) { logger_->Emit(LogLevel::Error, @@ -1546,7 +1542,7 @@ auto SourceTreeService::CheckRootTree( return ::grpc::Status::OK; } // check if tree is in a known repository - for (auto const& path : RemoteServeConfig::Instance().KnownRepositories()) { + for (auto const& path : serve_config_.KnownRepositories()) { auto has_tree = IsTreeInRepo(tree_id, path, logger_); if (not has_tree) { logger_->Emit(LogLevel::Error, |