diff options
| author | Per Larsson <[email protected]> | 2022-01-04 09:37:32 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2022-01-04 09:37:32 +0100 |
| commit | 1a5badefe3dbab50e315f720d3acb80ba9626801 (patch) | |
| tree | a6678e4384f662426eb3146c931076d5123999e1 | |
| parent | Changed timestamp to atomic int64. (diff) | |
| download | zen-1a5badefe3dbab50e315f720d3acb80ba9626801.tar.xz zen-1a5badefe3dbab50e315f720d3acb80ba9626801.zip | |
Removed upstream Zen default value(s) and trim empty url values.
| -rw-r--r-- | zenserver/config.cpp | 4 | ||||
| -rw-r--r-- | zenserver/zenserver.cpp | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/zenserver/config.cpp b/zenserver/config.cpp index b25d05409..c33fcfebc 100644 --- a/zenserver/config.cpp +++ b/zenserver/config.cpp @@ -285,14 +285,14 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions) "", "upstream-zen-url", "URL to remote Zen server. Use a comma separated list to choose the one with the best latency.", - cxxopts::value<std::vector<std::string>>(ServerOptions.UpstreamCacheConfig.ZenConfig.Urls)->default_value(""), + cxxopts::value<std::vector<std::string>>(ServerOptions.UpstreamCacheConfig.ZenConfig.Urls), ""); options.add_option("cache", "", "upstream-zen-dns", "DNS that resolves to one or more Zen server instance(s)", - cxxopts::value<std::vector<std::string>>(ServerOptions.UpstreamCacheConfig.ZenConfig.Dns)->default_value(""), + cxxopts::value<std::vector<std::string>>(ServerOptions.UpstreamCacheConfig.ZenConfig.Dns), ""); options.add_option("cache", diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index 0f67e3982..6e5d2fe93 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -693,14 +693,19 @@ ZenServer::InitializeStructuredCache(const ZenServerOptions& ServerOptions) { for (const std::string& Dns : UpstreamConfig.ZenConfig.Dns) { - const asio::error_code Err = zen::utils::ResolveHostname(m_IoContext, Dns, "1337"sv, ZenUrls); - if (Err) + if (!Dns.empty()) { - ZEN_ERROR("resolve '{}' FAILED, reason '{}'", Err.message()); + const asio::error_code Err = zen::utils::ResolveHostname(m_IoContext, Dns, "1337"sv, ZenUrls); + if (Err) + { + ZEN_ERROR("resolve '{}' FAILED, reason '{}'", Err.message()); + } } } } + std::erase_if(ZenUrls, [](const auto& Url) { return Url.empty(); }); + if (!ZenUrls.empty()) { std::unique_ptr<zen::UpstreamEndpoint> ZenEndpoint = |