add missing statsd.enabled and gc.projectstore.duration.seconds (#275)

- Bugfix: Fix parsing of workspace options in Lua config
- Bugfix: Add missing Lua option for option `--gc-projectstore-duration-seconds`
- Bugfix: Add missing Lua mapping option to `--statsd` command line option

1 files changed, 13 insertions, 10 deletions

diff --git a/src/zenserver/config.cpp b/src/zenserver/config.cpp
index 0dfdbe582..f3ad71356 100644
--- a/src/zenserver/config.cpp
+++ b/src/zenserver/config.cpp
@@ -400,25 +400,25 @@ ParseConfigFile(const std::filesystem::path& Path,
 #endif
 
 	////// stats
-	LuaOptions.AddOption("stats.enable"sv, ServerOptions.StatsConfig.Enabled);
+	LuaOptions.AddOption("stats.enable"sv, ServerOptions.StatsConfig.Enabled, "statsd"sv);
 	LuaOptions.AddOption("stats.host"sv, ServerOptions.StatsConfig.StatsdHost);
 	LuaOptions.AddOption("stats.port"sv, ServerOptions.StatsConfig.StatsdPort);
 
 	////// cache
 	LuaOptions.AddOption("cache.enable"sv, ServerOptions.StructuredCacheConfig.Enabled);
-	LuaOptions.AddOption("cache.writelog"sv, ServerOptions.StructuredCacheConfig.WriteLogEnabled, "cache-write-log");
-	LuaOptions.AddOption("cache.accesslog"sv, ServerOptions.StructuredCacheConfig.AccessLogEnabled, "cache-access-log");
+	LuaOptions.AddOption("cache.writelog"sv, ServerOptions.StructuredCacheConfig.WriteLogEnabled, "cache-write-log"sv);
+	LuaOptions.AddOption("cache.accesslog"sv, ServerOptions.StructuredCacheConfig.AccessLogEnabled, "cache-access-log"sv);
 
 	LuaOptions.AddOption("cache.memlayer.sizethreshold"sv,
 						 ServerOptions.StructuredCacheConfig.MemCacheSizeThreshold,
-						 "cache-memlayer-sizethreshold");
+						 "cache-memlayer-sizethreshold"sv);
 	LuaOptions.AddOption("cache.memlayer.targetfootprint"sv,
 						 ServerOptions.StructuredCacheConfig.MemTargetFootprintBytes,
-						 "cache-memlayer-targetfootprint");
+						 "cache-memlayer-targetfootprint"sv);
 	LuaOptions.AddOption("cache.memlayer.triminterval"sv,
 						 ServerOptions.StructuredCacheConfig.MemTrimIntervalSeconds,
-						 "cache-memlayer-triminterval");
-	LuaOptions.AddOption("cache.memlayer.maxage"sv, ServerOptions.StructuredCacheConfig.MemMaxAgeSeconds, "cache-memlayer-maxage");
+						 "cache-memlayer-triminterval"sv);
+	LuaOptions.AddOption("cache.memlayer.maxage"sv, ServerOptions.StructuredCacheConfig.MemMaxAgeSeconds, "cache-memlayer-maxage"sv);
 
 	////// cache.upstream
 	LuaOptions.AddOption("cache.upstream.policy"sv, ServerOptions.UpstreamCacheConfig.CachePolicy, "upstream-cache-policy"sv);
@@ -461,6 +461,7 @@ ParseConfigFile(const std::filesystem::path& Path,
 	LuaOptions.AddOption("cache.upstream.zen.dns"sv, ServerOptions.UpstreamCacheConfig.ZenConfig.Dns);
 	LuaOptions.AddOption("cache.upstream.zen.url"sv, ServerOptions.UpstreamCacheConfig.ZenConfig.Urls);
 
+	////// gc
 	LuaOptions.AddOption("gc.enabled"sv, ServerOptions.GcConfig.Enabled, "gc-enabled"sv);
 	LuaOptions.AddOption("gc.v2"sv, ServerOptions.GcConfig.UseGCV2, "gc-v2"sv);
 
@@ -487,22 +488,24 @@ ParseConfigFile(const std::filesystem::path& Path,
 	LuaOptions.AddOption("gc.attachment.passes"sv, ServerOptions.GcConfig.AttachmentPassCount, "gc-attachment-passes"sv);
 	LuaOptions.AddOption("gc.validation"sv, ServerOptions.GcConfig.EnableValidation, "gc-validation");
 
-	////// gc
 	LuaOptions.AddOption("gc.cache.maxdurationseconds"sv, ServerOptions.GcConfig.Cache.MaxDurationSeconds, "gc-cache-duration-seconds"sv);
+	LuaOptions.AddOption("gc.projectstore.duration.seconds"sv,
+						 ServerOptions.GcConfig.ProjectStore.MaxDurationSeconds,
+						 "gc-projectstore-duration-seconds");
 
 	////// security
 	LuaOptions.AddOption("security.encryptionaeskey"sv, ServerOptions.EncryptionKey, "encryption-aes-key"sv);
 	LuaOptions.AddOption("security.encryptionaesiv"sv, ServerOptions.EncryptionIV, "encryption-aes-iv"sv);
 	LuaOptions.AddOption("security.openidproviders"sv, ServerOptions.AuthConfig);
 
-	LuaOptions.Parse(Path, CmdLineResult);
-
 	////// workspaces
 	LuaOptions.AddOption("workspaces.enabled"sv, ServerOptions.WorksSpacesConfig.Enabled, "workspaces-enabled"sv);
 	LuaOptions.AddOption("workspaces.allowconfigchanges"sv,
 						 ServerOptions.WorksSpacesConfig.AllowConfigurationChanges,
 						 "workspaces-allow-changes"sv);
 
+	LuaOptions.Parse(Path, CmdLineResult);
+
 	// These have special command line processing so we make sure we export them if they were configured on command line
 	if (!ServerOptions.AuthConfig.OpenIdProviders.empty())
 	{