Fixed issue with missing endpoint name when configuring upstream cache from Lua.

1 files changed, 9 insertions, 4 deletions

diff --git a/zenserver/config.cpp b/zenserver/config.cpp
index 3c4f6f3d8..a36ce5f33 100644
--- a/zenserver/config.cpp
+++ b/zenserver/config.cpp
@@ -337,10 +337,10 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions)
 			exit(0);
 		}
 
-		ServerOptions.DataDir = DataDir;
-		ServerOptions.ContentDir = ContentDir;
-		ServerOptions.AbsLogFile = AbsLogFile;
-		ServerOptions.ConfigFile = ConfigFile;
+		ServerOptions.DataDir						  = DataDir;
+		ServerOptions.ContentDir					  = ContentDir;
+		ServerOptions.AbsLogFile					  = AbsLogFile;
+		ServerOptions.ConfigFile					  = ConfigFile;
 		ServerOptions.UpstreamCacheConfig.CachePolicy = ParseUpstreamCachePolicy(UpstreamCachePolicyOptions);
 
 		if (!ServerOptions.ConfigFile.empty())
@@ -479,6 +479,9 @@ ParseConfigFile(const std::filesystem::path& Path, ZenServerOptions& ServerOptio
 				if (auto JupiterConfig = UpstreamConfig->get<sol::optional<sol::table>>("jupiter"))
 				{
 					UpdateStringValueFromConfig(JupiterConfig.value(),
+												std::string_view("name"),
+												ServerOptions.UpstreamCacheConfig.JupiterConfig.Name);
+					UpdateStringValueFromConfig(JupiterConfig.value(),
 												std::string_view("url"),
 												ServerOptions.UpstreamCacheConfig.JupiterConfig.Url);
 					UpdateStringValueFromConfig(JupiterConfig.value(),
@@ -507,6 +510,8 @@ ParseConfigFile(const std::filesystem::path& Path, ZenServerOptions& ServerOptio
 
 				if (auto ZenConfig = UpstreamConfig->get<sol::optional<sol::table>>("zen"))
 				{
+					ServerOptions.UpstreamCacheConfig.ZenConfig.Name = ZenConfig.value().get_or("name", std::string("Zen"));
+
 					if (auto Url = ZenConfig.value().get<sol::optional<std::string>>("url"))
 					{
 						ServerOptions.UpstreamCacheConfig.ZenConfig.Urls.push_back(Url.value());