Make ServerImpl a general class, not singleton

2 files changed, 46 insertions, 42 deletions

diff --git a/src/buildtool/execution_api/execution_service/server_implementation.cpp b/src/buildtool/execution_api/execution_service/server_implementation.cpp
index 63322451..73734840 100644
--- a/src/buildtool/execution_api/execution_service/server_implementation.cpp
+++ b/src/buildtool/execution_api/execution_service/server_implementation.cpp
@@ -53,6 +53,34 @@ auto TryWrite(std::string const& file, T const& content) noexcept -> bool {
 }
 }  // namespace
 
+auto ServerImpl::Create(std::optional<std::string> interface,
+                        std::optional<int> port,
+                        std::optional<std::string> info_file,
+                        std::optional<std::string> pid_file) noexcept
+    -> std::optional<ServerImpl> {
+    ServerImpl server;
+    if (interface) {
+        server.interface_ = std::move(*interface);
+    }
+    if (port) {
+        auto parsed_port = ParsePort(*port);
+        if (parsed_port) {
+            server.port_ = static_cast<int>(*parsed_port);
+        }
+        else {
+            Logger::Log(LogLevel::Error, "Invalid port '{}'", *port);
+            return std::nullopt;
+        }
+    }
+    if (info_file) {
+        server.info_file_ = std::move(*info_file);
+    }
+    if (pid_file) {
+        server.pid_file_ = std::move(*pid_file);
+    }
+    return std::move(server);
+}
+
 auto ServerImpl::Run(StorageConfig const& storage_config,
                      Storage const& storage,
                      ApiBundle const& apis,
@@ -129,24 +157,3 @@ auto ServerImpl::Run(StorageConfig const& storage_config,
     server->Wait();
     return true;
 }
-
-[[nodiscard]] auto ServerImpl::SetInfoFile(std::string const& x) noexcept
-    -> bool {
-    Instance().info_file_ = x;
-    return true;
-}
-
-[[nodiscard]] auto ServerImpl::SetPidFile(std::string const& x) noexcept
-    -> bool {
-    Instance().pid_file_ = x;
-    return true;
-}
-
-[[nodiscard]] auto ServerImpl::SetPort(int const x) noexcept -> bool {
-    auto port_num = ParsePort(x);
-    if (!port_num) {
-        return false;
-    }
-    Instance().port_ = static_cast<int>(*port_num);
-    return true;
-}
diff --git a/src/buildtool/execution_api/execution_service/server_implementation.hpp b/src/buildtool/execution_api/execution_service/server_implementation.hpp
index 97264fe1..d9e16dad 100644
--- a/src/buildtool/execution_api/execution_service/server_implementation.hpp
+++ b/src/buildtool/execution_api/execution_service/server_implementation.hpp
@@ -24,40 +24,37 @@
 #include "src/buildtool/storage/config.hpp"
 #include "src/buildtool/storage/storage.hpp"
 
-class ServerImpl {
+class ServerImpl final {
   public:
-    ServerImpl() noexcept = default;
-    [[nodiscard]] static auto Instance() noexcept -> ServerImpl& {
-        static ServerImpl x;
-        return x;
-    }
-
-    [[nodiscard]] static auto SetInterface(std::string const& x) noexcept
-        -> bool {
-        Instance().interface_ = x;
-        return true;
-    }
-
-    [[nodiscard]] static auto SetPidFile(std::string const& x) noexcept -> bool;
+    [[nodiscard]] static auto Create(
+        std::optional<std::string> interface,
+        std::optional<int> port,
+        std::optional<std::string> info_file,
+        std::optional<std::string> pid_file) noexcept
+        -> std::optional<ServerImpl>;
 
-    [[nodiscard]] static auto SetPort(int x) noexcept -> bool;
-
-    [[nodiscard]] static auto SetInfoFile(std::string const& x) noexcept
-        -> bool;
+    ~ServerImpl() noexcept = default;
 
     ServerImpl(ServerImpl const&) = delete;
     auto operator=(ServerImpl const&) noexcept -> ServerImpl& = delete;
 
-    ServerImpl(ServerImpl&&) noexcept = delete;
-    auto operator=(ServerImpl&&) noexcept -> ServerImpl& = delete;
+    ServerImpl(ServerImpl&&) noexcept = default;
+    auto operator=(ServerImpl&&) noexcept -> ServerImpl& = default;
 
+    /// \brief Start the execution service.
+    /// \param storage_config   StorageConfig to be used.
+    /// \param storage          Storage to be used.
+    /// \param apis             Apis to be used, only local api is actually
+    ///                         needed.
+    /// \param op_exponent      Log2 threshold for operation cache.
     auto Run(StorageConfig const& storage_config,
              Storage const& storage,
              ApiBundle const& apis,
              std::optional<std::uint8_t> op_exponent) -> bool;
-    ~ServerImpl() = default;
 
   private:
+    ServerImpl() noexcept = default;
+
     std::string interface_{"127.0.0.1"};
     int port_{0};
     std::string info_file_{};