diff options
| author | Per Larsson <[email protected]> | 2021-09-06 15:17:56 +0200 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2021-09-06 15:17:56 +0200 |
| commit | 8db3555b52168fd7c70244d4f92144a1c4c44e17 (patch) | |
| tree | d8429393470ff985f6b57c083e6458ee2720c03c /zenserver/config.cpp | |
| parent | Merge branch 'main' of https://github.com/EpicGames/zen (diff) | |
| download | zen-8db3555b52168fd7c70244d4f92144a1c4c44e17.tar.xz zen-8db3555b52168fd7c70244d4f92144a1c4c44e17.zip | |
Support for switching between storing derived data using the legacy DDC endpoint and the Commmon Blob Store endpoint.
Diffstat (limited to 'zenserver/config.cpp')
| -rw-r--r-- | zenserver/config.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/zenserver/config.cpp b/zenserver/config.cpp index 06b355b7a..904e613a4 100644 --- a/zenserver/config.cpp +++ b/zenserver/config.cpp @@ -146,6 +146,13 @@ ParseGlobalCliOptions(int argc, char* argv[], ZenServerOptions& GlobalOptions, Z options.add_option("cache", "", + "upstream-jupiter-use-legacy-ddc", + "Whether to store derived data using the legacy endpoint", + cxxopts::value<bool>(ServiceConfig.UpstreamCacheConfig.JupiterConfig.UseLegacyDdc)->default_value("false"), + ""); + + options.add_option("cache", + "", "upstream-zen-url", "URL to a remote Zen server instance", cxxopts::value<std::string>(ServiceConfig.UpstreamCacheConfig.ZenConfig.Url)->default_value(""), @@ -235,7 +242,7 @@ ParseServiceConfig(const std::filesystem::path& DataRoot, ZenServiceConfig& Serv throw std::exception("fatal zen global config script ({}) failure: {}"_format(ConfigScript, e.what()).c_str()); } - ServiceConfig.MeshEnabled = lua["mesh"]["enable"].get_or(ServiceConfig.MeshEnabled); + ServiceConfig.MeshEnabled = lua["mesh"]["enable"].get_or(ServiceConfig.MeshEnabled); auto UpdateStringValueFromConfig = [](const sol::table& Table, std::string_view Key, std::string& OutValue) { // Update the specified config value unless it has been set, i.e. from command line @@ -278,6 +285,9 @@ ParseServiceConfig(const std::filesystem::path& DataRoot, ZenServiceConfig& Serv ServiceConfig.UpstreamCacheConfig.JupiterConfig.UseDevelopmentSettings = JupiterConfig->get_or("usedevelopmentsettings", ServiceConfig.UpstreamCacheConfig.JupiterConfig.UseDevelopmentSettings); + + ServiceConfig.UpstreamCacheConfig.JupiterConfig.UseLegacyDdc = + JupiterConfig->get_or("uselegacyddc", ServiceConfig.UpstreamCacheConfig.JupiterConfig.UseLegacyDdc); }; if (auto ZenConfig = UpstreamConfig->get<sol::optional<sol::table>>("zen")) |