From 651af149098289b60cdfb062d36eb435d8e49c52 Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Tue, 11 Jun 2024 17:19:14 +0200
Subject: Pass ServeApi to ServeServerImpl by reference

...instead of using singleton calls.
---
 src/buildtool/main/main.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/buildtool/main/main.cpp')

diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp
index f4d0f566..0063e9bd 100644
--- a/src/buildtool/main/main.cpp
+++ b/src/buildtool/main/main.cpp
@@ -867,8 +867,14 @@ auto main(int argc, char* argv[]) -> int {
 
         if (arguments.cmd == SubCommand::kServe) {
             SetupServeServiceConfig(arguments.service);
+            std::optional<gsl::not_null<const ServeApi*>> serve;
+            if (RemoteServeConfig::Instance().RemoteAddress()) {
+                serve = &ServeApi::Instance();
+            }
+
             if (!ServeServerImpl::Instance().Run(
                     RemoteServeConfig::Instance(),
+                    serve,
                     !RemoteExecutionConfig::RemoteAddress())) {
                 return kExitFailure;
             }
-- 
cgit v1.2.3