From d86ca9ac1c76e2841c44ede6b39930b6f934ef93 Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Mon, 13 Oct 2025 12:01:55 +0200 Subject: move service common code into base class (#567) Separates storage server code and generic server code into two classes. This is a change to prepare for different services to be implemented using the same framework, into the same executable --- src/zenserver/config.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/zenserver/config.cpp') diff --git a/src/zenserver/config.cpp b/src/zenserver/config.cpp index a355f0ed5..ce3a70184 100644 --- a/src/zenserver/config.cpp +++ b/src/zenserver/config.cpp @@ -95,7 +95,7 @@ ReadAllCentralManifests(const std::filesystem::path& SystemRoot) } void -ValidateOptions(ZenServerOptions& ServerOptions) +ValidateOptions(ZenStorageServerOptions& ServerOptions) { if (ServerOptions.EncryptionKey.empty() == false) { @@ -440,7 +440,7 @@ MakeOption(std::vector>& }; void -ParseEnvVariables(ZenServerOptions& ServerOptions, const cxxopts::ParseResult& CmdLineResult) +ParseEnvVariables(ZenStorageServerOptions& ServerOptions, const cxxopts::ParseResult& CmdLineResult) { using namespace std::literals; @@ -464,7 +464,7 @@ ParseEnvVariables(ZenServerOptions& ServerOptions, const cxxopts::ParseResult& C void ParseConfigFile(const std::filesystem::path& Path, - ZenServerOptions& ServerOptions, + ZenStorageServerOptions& ServerOptions, const cxxopts::ParseResult& CmdLineResult, std::string_view OutputConfigFile) { @@ -679,7 +679,7 @@ ParseConfigFile(const std::filesystem::path& Path, } void -ParsePluginsConfigFile(const std::filesystem::path& Path, ZenServerOptions& ServerOptions, int BasePort) +ParsePluginsConfigFile(const std::filesystem::path& Path, ZenStorageServerOptions& ServerOptions, int BasePort) { using namespace std::literals; @@ -741,7 +741,7 @@ ParsePluginsConfigFile(const std::filesystem::path& Path, ZenServerOptions& Serv } void -ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions) +ParseCliOptions(int argc, char* argv[], ZenStorageServerOptions& ServerOptions) { const char* DefaultHttp = "asio"; -- cgit v1.2.3