aboutsummaryrefslogtreecommitdiff
path: root/zenserver/config.cpp
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-11-01 16:48:55 +0100
committerStefan Boberg <[email protected]>2021-11-01 16:48:55 +0100
commita8f9941f5c8dff75f606e130f7132babda6265bb (patch)
treeb5d424562420223495fdbcdd6c9dab051519e8ce /zenserver/config.cpp
parentfilecas: Fixed debug logging (diff)
parentMerged from main (diff)
downloadzen-a8f9941f5c8dff75f606e130f7132babda6265bb.tar.xz
zen-a8f9941f5c8dff75f606e130f7132babda6265bb.zip
Merge branch 'gc' of https://github.com/EpicGames/zen into gc
Diffstat (limited to 'zenserver/config.cpp')
-rw-r--r--zenserver/config.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/zenserver/config.cpp b/zenserver/config.cpp
index cbdbebb03..f512f8015 100644
--- a/zenserver/config.cpp
+++ b/zenserver/config.cpp
@@ -234,6 +234,13 @@ ParseGlobalCliOptions(int argc, char* argv[], ZenServerOptions& GlobalOptions, Z
options.add_option("cache",
"",
+ "upstream-zen-dns",
+ "DNS that resolves to one or more Zen server instance(s)",
+ cxxopts::value<std::vector<std::string>>(ServiceConfig.UpstreamCacheConfig.ZenConfig.Dns)->default_value(""),
+ "");
+
+ options.add_option("cache",
+ "",
"upstream-thread-count",
"Number of threads used for upstream procsssing",
cxxopts::value<int>(ServiceConfig.UpstreamCacheConfig.UpstreamThreadCount)->default_value("4"),