From d08e6f1af5a96818c9e7c2c9e0a6288470489822 Mon Sep 17 00:00:00 2001 From: Maksim Denisov Date: Wed, 12 Jun 2024 17:49:55 +0200 Subject: Pass RemoteAddress to ConfigurationClient by value ...instead of using singleton calls. --- src/buildtool/serve_api/remote/configuration_client.hpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/buildtool/serve_api/remote/configuration_client.hpp') diff --git a/src/buildtool/serve_api/remote/configuration_client.hpp b/src/buildtool/serve_api/remote/configuration_client.hpp index eab0cbca..aeebc303 100644 --- a/src/buildtool/serve_api/remote/configuration_client.hpp +++ b/src/buildtool/serve_api/remote/configuration_client.hpp @@ -24,21 +24,25 @@ #include "justbuild/just_serve/just_serve.grpc.pb.h" #include "src/buildtool/common/remote/client_common.hpp" #include "src/buildtool/common/remote/port.hpp" +#include "src/buildtool/common/remote/remote_common.hpp" #include "src/buildtool/logging/logger.hpp" /// Implements client side for Configuration service defined in: /// src/buildtool/serve_api/serve_service/just_serve.proto class ConfigurationClient { public: - ConfigurationClient(std::string const& server, Port port) noexcept - : stub_{justbuild::just_serve::Configuration::NewStub( - CreateChannelWithCredentials(server, port))} {} + explicit ConfigurationClient(ServerAddress address) noexcept + : client_serve_address_{std::move(address)}, + stub_{justbuild::just_serve::Configuration::NewStub( + CreateChannelWithCredentials(client_serve_address_.host, + client_serve_address_.port))} {} [[nodiscard]] auto CheckServeRemoteExecution() const noexcept -> bool; [[nodiscard]] auto IsCompatible() const noexcept -> std::optional; private: + ServerAddress const client_serve_address_; std::unique_ptr stub_; Logger logger_{"RemoteConfigurationClient"}; }; -- cgit v1.2.3