diff options
5 files changed, 25 insertions, 0 deletions
diff --git a/src/buildtool/serve_api/serve_service/TARGETS b/src/buildtool/serve_api/serve_service/TARGETS index 5085cd00..1097bc88 100644 --- a/src/buildtool/serve_api/serve_service/TARGETS +++ b/src/buildtool/serve_api/serve_service/TARGETS @@ -170,12 +170,14 @@ , ["@", "gsl", "", "gsl"] , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/execution_api/remote", "config"] + , ["src/buildtool/logging", "logging"] , ["src/buildtool/serve_api/remote", "config"] ] , "stage": ["src", "buildtool", "serve_api", "serve_service"] , "private-deps": [ ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/common/remote", "remote_common"] + , ["src/buildtool/logging", "log_level"] ] } , "target_utils": diff --git a/src/buildtool/serve_api/serve_service/configuration.cpp b/src/buildtool/serve_api/serve_service/configuration.cpp index 503267f9..a433e3cc 100644 --- a/src/buildtool/serve_api/serve_service/configuration.cpp +++ b/src/buildtool/serve_api/serve_service/configuration.cpp @@ -21,12 +21,14 @@ #include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/remote/remote_common.hpp" +#include "src/buildtool/logging/log_level.hpp" auto ConfigurationService::RemoteExecutionEndpoint( ::grpc::ServerContext* /*context*/, const ::justbuild::just_serve::RemoteExecutionEndpointRequest* /*request*/, ::justbuild::just_serve::RemoteExecutionEndpointResponse* response) -> ::grpc::Status { + logger_->Emit(LogLevel::Debug, "RemoteExecutionEndpoint()"); std::optional<ServerAddress> address; if (serve_config_.client_execution_address.has_value()) { address = serve_config_.client_execution_address; @@ -43,6 +45,7 @@ auto ConfigurationService::Compatibility( const ::justbuild::just_serve::CompatibilityRequest* /*request*/, ::justbuild::just_serve::CompatibilityResponse* response) -> ::grpc::Status { + logger_->Emit(LogLevel::Debug, "Compatibility()"); response->set_compatible(not ProtocolTraits::IsNative(hash_type_)); return ::grpc::Status::OK; } diff --git a/src/buildtool/serve_api/serve_service/configuration.hpp b/src/buildtool/serve_api/serve_service/configuration.hpp index ce37c31d..dbf69e0c 100644 --- a/src/buildtool/serve_api/serve_service/configuration.hpp +++ b/src/buildtool/serve_api/serve_service/configuration.hpp @@ -15,6 +15,8 @@ #ifndef INCLUDED_SRC_BUILD_SERVE_API_SERVE_SERVICE_CONFIGURATION_HPP #define INCLUDED_SRC_BUILD_SERVE_API_SERVE_SERVICE_CONFIGURATION_HPP +#include <memory> + #include <grpcpp/grpcpp.h> #include "gsl/gsl" @@ -22,6 +24,7 @@ #include "justbuild/just_serve/just_serve.pb.h" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/execution_api/remote/config.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/serve_api/remote/config.hpp" // This service can be used by the client to double-check the server @@ -62,6 +65,8 @@ class ConfigurationService final HashFunction::Type hash_type_; RemoteExecutionConfig const& remote_config_; RemoteServeConfig const& serve_config_; + std::shared_ptr<Logger> logger_{ + std::make_shared<Logger>("configuration-service")}; }; #endif // INCLUDED_SRC_BUILD_SERVE_API_SERVE_SERVICE_CONFIGURATION_HPP diff --git a/src/buildtool/serve_api/serve_service/source_tree.cpp b/src/buildtool/serve_api/serve_service/source_tree.cpp index 02007e1e..7ffe176e 100644 --- a/src/buildtool/serve_api/serve_service/source_tree.cpp +++ b/src/buildtool/serve_api/serve_service/source_tree.cpp @@ -232,6 +232,8 @@ auto SourceTreeService::ServeCommitTree( ::grpc::ServerContext* /* context */, const ::justbuild::just_serve::ServeCommitTreeRequest* request, ServeCommitTreeResponse* response) -> ::grpc::Status { + logger_->Emit( + LogLevel::Debug, "ServeCommitTree({}, ...)", request->commit()); // get lock for Git cache auto repo_lock = RepositoryGarbageCollector::SharedLock( *native_context_->storage_config); @@ -691,6 +693,8 @@ auto SourceTreeService::ServeArchiveTree( ::grpc::ServerContext* /* context */, const ::justbuild::just_serve::ServeArchiveTreeRequest* request, ServeArchiveTreeResponse* response) -> ::grpc::Status { + logger_->Emit( + LogLevel::Debug, "ServeArchiveTree({}, ...)", request->content()); // get gc lock for Git cache auto repo_lock = RepositoryGarbageCollector::SharedLock( *native_context_->storage_config); @@ -985,6 +989,7 @@ auto SourceTreeService::ServeDistdirTree( ::grpc::ServerContext* /* context */, const ::justbuild::just_serve::ServeDistdirTreeRequest* request, ServeDistdirTreeResponse* response) -> ::grpc::Status { + logger_->Emit(LogLevel::Debug, "ServeDistdirTree(...)"); // get gc lock for Git cache auto repo_lock = RepositoryGarbageCollector::SharedLock( *native_context_->storage_config); @@ -1248,6 +1253,7 @@ auto SourceTreeService::ServeContent( const ::justbuild::just_serve::ServeContentRequest* request, ServeContentResponse* response) -> ::grpc::Status { auto const& content{request->content()}; + logger_->Emit(LogLevel::Debug, "ServeContent({})", content); // get gc lock for Git cache auto repo_lock = RepositoryGarbageCollector::SharedLock( *native_context_->storage_config); @@ -1465,6 +1471,7 @@ auto SourceTreeService::CheckRootTree( const ::justbuild::just_serve::CheckRootTreeRequest* request, CheckRootTreeResponse* response) -> ::grpc::Status { auto const& tree_id{request->tree()}; + logger_->Emit(LogLevel::Debug, "CheckRootTree({})", tree_id); // get gc lock for Git cache auto repo_lock = RepositoryGarbageCollector::SharedLock( *native_context_->storage_config); @@ -1595,6 +1602,8 @@ auto SourceTreeService::GetRemoteTree( ::grpc::ServerContext* /* context */, const ::justbuild::just_serve::GetRemoteTreeRequest* request, GetRemoteTreeResponse* response) -> ::grpc::Status { + logger_->Emit( + LogLevel::Debug, "GetRemoteTree({})", request->digest().hash()); // get gc lock for Git cache auto repo_lock = RepositoryGarbageCollector::SharedLock( *native_context_->storage_config); @@ -1686,6 +1695,7 @@ auto SourceTreeService::ComputeTreeStructure( ::grpc::ServerContext* /*context*/, const ::justbuild::just_serve::ComputeTreeStructureRequest* request, ComputeTreeStructureResponse* response) -> ::grpc::Status { + logger_->Emit(LogLevel::Debug, "GetTreeStructure({})", request->tree()); auto repo_lock = RepositoryGarbageCollector::SharedLock( *native_context_->storage_config); if (not repo_lock) { diff --git a/src/buildtool/serve_api/serve_service/target.cpp b/src/buildtool/serve_api/serve_service/target.cpp index cc51f1f8..49825a6e 100644 --- a/src/buildtool/serve_api/serve_service/target.cpp +++ b/src/buildtool/serve_api/serve_service/target.cpp @@ -221,6 +221,8 @@ auto TargetService::ServeTarget( return ::grpc::Status{::grpc::StatusCode::INVALID_ARGUMENT, target_cache_key_digest.error()}; } + logger_->Emit( + LogLevel::Debug, "ServeTarget({})", target_cache_key_digest->hash()); // acquire locks auto repo_lock = @@ -673,6 +675,7 @@ auto TargetService::ServeTargetVariables( auto const& root_tree{request->root_tree()}; auto const& target_file{request->target_file()}; auto const& target{request->target()}; + logger_->Emit(LogLevel::Debug, "ServeTargetVariables({}, ...)", root_tree); // retrieve content of target file std::optional<std::string> target_file_content{std::nullopt}; bool tree_found{false}; @@ -829,6 +832,8 @@ auto TargetService::ServeTargetDescription( auto const& root_tree{request->root_tree()}; auto const& target_file{request->target_file()}; auto const& target{request->target()}; + logger_->Emit( + LogLevel::Debug, "ServeTargetDescription({}, ...)", root_tree); // retrieve content of target file std::optional<std::string> target_file_content{std::nullopt}; bool tree_found{false}; |