revert 61b4a88f and cadaad63

4 files changed, 37 insertions, 78 deletions

diff --git a/src/zenserver/config.cpp b/src/zenserver/config.cpp
index 1f9ae5fb6..055376b5c 100644
--- a/src/zenserver/config.cpp
+++ b/src/zenserver/config.cpp
@@ -16,7 +16,6 @@
 #include <zencore/string.h>
 #include <zenhttp/zenhttp.h>
 #include <zenutil/commandlineoptions.h>
-#include <zenutil/environmentoptions.h>
 
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <fmt/format.h>
@@ -430,29 +429,6 @@ MakeOption(std::vector<std::pair<std::string, ZenStructuredCacheBucketConfig>>&
 };
 
 void
-ParseEnvVariables(ZenServerOptions& ServerOptions, const cxxopts::ParseResult& CmdLineResult)
-{
-	using namespace std::literals;
-
-	EnvironmentOptions Options;
-	Options.AddOption("UE_ZEN_SENTRY_ALLOWPERSONALINFO"sv, ServerOptions.SentryConfig.AllowPII, "sentry-allow-personal-info"sv);
-	Options.AddOption("UE_ZEN_SENTRY_DSN"sv, ServerOptions.SentryConfig.Dsn, "sentry-dsn"sv);
-	Options.AddOption("UE_ZEN_SENTRY_ENVIRONMENT"sv, ServerOptions.SentryConfig.Environment, "sentry-environment"sv);
-
-	bool EnvEnableSentry = !ServerOptions.SentryConfig.Disable;
-	Options.AddOption("UE_ZEN_SENTRY_ENABLED"sv, EnvEnableSentry, "no-sentry"sv);
-
-	Options.AddOption("UE_ZEN_SENTRY_DEBUG"sv, ServerOptions.SentryConfig.Debug, "sentry-debug"sv);
-
-	Options.Parse(CmdLineResult);
-
-	if (EnvEnableSentry != !ServerOptions.SentryConfig.Disable)
-	{
-		ServerOptions.SentryConfig.Disable = !EnvEnableSentry;
-	}
-}
-
-void
 ParseConfigFile(const std::filesystem::path& Path,
 				ZenServerOptions&			 ServerOptions,
 				const cxxopts::ParseResult&	 CmdLineResult,
@@ -465,11 +441,9 @@ ParseConfigFile(const std::filesystem::path& Path,
 	////// server
 	LuaOptions.AddOption("server.dedicated"sv, ServerOptions.IsDedicated, "dedicated"sv);
 	LuaOptions.AddOption("server.logid"sv, ServerOptions.LogId, "log-id"sv);
-	LuaOptions.AddOption("server.sentry.disable"sv, ServerOptions.SentryConfig.Disable, "no-sentry"sv);
-	LuaOptions.AddOption("server.sentry.allowpersonalinfo"sv, ServerOptions.SentryConfig.AllowPII, "sentry-allow-personal-info"sv);
-	LuaOptions.AddOption("server.sentry.dsn"sv, ServerOptions.SentryConfig.Dsn, "sentry-dsn"sv);
-	LuaOptions.AddOption("server.sentry.environment"sv, ServerOptions.SentryConfig.Environment, "sentry-environment"sv);
-	LuaOptions.AddOption("server.sentry.debug"sv, ServerOptions.SentryConfig.Debug, "sentry-debug"sv);
+	LuaOptions.AddOption("server.sentry.disable"sv, ServerOptions.NoSentry, "no-sentry"sv);
+	LuaOptions.AddOption("server.sentry.allowpersonalinfo"sv, ServerOptions.SentryAllowPII, "sentry-allow-personal-info"sv);
+	LuaOptions.AddOption("server.sentry.dsn"sv, ServerOptions.SentryDsn, "sentry-dsn"sv);
 	LuaOptions.AddOption("server.systemrootdir"sv, ServerOptions.SystemRootDir, "system-dir"sv);
 	LuaOptions.AddOption("server.datadir"sv, ServerOptions.DataDir, "data-dir"sv);
 	LuaOptions.AddOption("server.contentdir"sv, ServerOptions.ContentDir, "content-dir"sv);
@@ -785,15 +759,11 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions)
 	options.add_options()("write-config", "Path to output Lua config file", cxxopts::value<std::string>(OutputConfigFile));
 	options.add_options()("no-sentry",
 						  "Disable Sentry crash handler",
-						  cxxopts::value<bool>(ServerOptions.SentryConfig.Disable)->default_value("false"));
+						  cxxopts::value<bool>(ServerOptions.NoSentry)->default_value("false"));
 	options.add_options()("sentry-allow-personal-info",
 						  "Allow personally identifiable information in sentry crash reports",
-						  cxxopts::value<bool>(ServerOptions.SentryConfig.AllowPII)->default_value("false"));
-	options.add_options()("sentry-dsn", "Sentry DSN to send events to", cxxopts::value<std::string>(ServerOptions.SentryConfig.Dsn));
-	options.add_options()("sentry-environment", "Sentry environment", cxxopts::value<std::string>(ServerOptions.SentryConfig.Environment));
-	options.add_options()("sentry-debug",
-						  "Enable debug mode for Sentry",
-						  cxxopts::value<bool>(ServerOptions.SentryConfig.Debug)->default_value("false"));
+						  cxxopts::value<bool>(ServerOptions.SentryAllowPII)->default_value("false"));
+	options.add_options()("sentry-dsn", "Sentry DSN to send events to", cxxopts::value<std::string>(ServerOptions.SentryDsn));
 	options.add_options()("detach",
 						  "Indicate whether zenserver should detach from parent process group",
 						  cxxopts::value<bool>(ServerOptions.Detach)->default_value("true"));
@@ -1366,8 +1336,6 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions)
 
 		ServerOptions.ObjectStoreConfig = ParseBucketConfigs(BucketConfigs);
 
-		ParseEnvVariables(ServerOptions, Result);
-
 		if (!ServerOptions.ConfigFile.empty())
 		{
 			ParseConfigFile(ServerOptions.ConfigFile, ServerOptions, Result, OutputConfigFile);
diff --git a/src/zenserver/config.h b/src/zenserver/config.h
index 9753e3ae2..1a1793b8d 100644
--- a/src/zenserver/config.h
+++ b/src/zenserver/config.h
@@ -157,15 +157,6 @@ struct ZenWorkspacesConfig
 	bool AllowConfigurationChanges = false;
 };
 
-struct ZenSentryConfig
-{
-	bool		Disable	 = false;
-	bool		AllowPII = false;  // Allow personally identifiable information in sentry crash reports
-	std::string Dsn;
-	std::string Environment;
-	bool		Debug = false;	// Enable debug mode for Sentry
-};
-
 struct ZenServerOptions
 {
 	ZenUpstreamCacheConfig	 UpstreamCacheConfig;
@@ -178,29 +169,31 @@ struct ZenServerOptions
 	ZenBuildStoreConfig		 BuildStoreConfig;
 	ZenStatsConfig			 StatsConfig;
 	ZenWorkspacesConfig		 WorksSpacesConfig;
-	ZenSentryConfig			 SentryConfig;
-	std::filesystem::path	 SystemRootDir;				  // System root directory (used for machine level config)
-	std::filesystem::path	 DataDir;					  // Root directory for state (used for testing)
-	std::filesystem::path	 ContentDir;				  // Root directory for serving frontend content (experimental)
-	std::filesystem::path	 AbsLogFile;				  // Absolute path to main log file
-	std::filesystem::path	 ConfigFile;				  // Path to Lua config file
-	std::filesystem::path	 PluginsConfigFile;			  // Path to plugins config file
-	std::filesystem::path	 BaseSnapshotDir;			  // Path to server state snapshot (will be copied into data dir on start)
-	std::string				 ChildId;					  // Id assigned by parent process (used for lifetime management)
-	std::string				 LogId;						  // Id for tagging log output
-	std::string				 EncryptionKey;				  // 256 bit AES encryption key
-	std::string				 EncryptionIV;				  // 128 bit AES initialization vector
-	int						 BasePort			= 8558;	  // Service listen port (used for both UDP and TCP)
-	int						 OwnerPid			= 0;	  // Parent process id (zero for standalone)
-	bool					 InstallService		= false;  // Flag used to initiate service install (temporary)
-	bool					 UninstallService	= false;  // Flag used to initiate service uninstall (temporary)
-	bool					 IsDebug			= false;
-	bool					 IsCleanStart		= false;  // Indicates whether all state should be wiped on startup or not
-	bool					 IsPowerCycle		= false;  // When true, the process shuts down immediately after initialization
-	bool					 IsTest				= false;
-	bool					 IsDedicated		= false;  // Indicates a dedicated/shared instance, with larger resource requirements
-	bool					 ShouldCrash		= false;  // Option for testing crash handling
-	bool					 IsFirstRun			= false;
+	std::filesystem::path	 SystemRootDir;				// System root directory (used for machine level config)
+	std::filesystem::path	 DataDir;					// Root directory for state (used for testing)
+	std::filesystem::path	 ContentDir;				// Root directory for serving frontend content (experimental)
+	std::filesystem::path	 AbsLogFile;				// Absolute path to main log file
+	std::filesystem::path	 ConfigFile;				// Path to Lua config file
+	std::filesystem::path	 PluginsConfigFile;			// Path to plugins config file
+	std::filesystem::path	 BaseSnapshotDir;			// Path to server state snapshot (will be copied into data dir on start)
+	std::string				 ChildId;					// Id assigned by parent process (used for lifetime management)
+	std::string				 LogId;						// Id for tagging log output
+	std::string				 EncryptionKey;				// 256 bit AES encryption key
+	std::string				 EncryptionIV;				// 128 bit AES initialization vector
+	int						 BasePort		  = 8558;	// Service listen port (used for both UDP and TCP)
+	int						 OwnerPid		  = 0;		// Parent process id (zero for standalone)
+	bool					 InstallService	  = false;	// Flag used to initiate service install (temporary)
+	bool					 UninstallService = false;	// Flag used to initiate service uninstall (temporary)
+	bool					 IsDebug		  = false;
+	bool					 IsCleanStart	  = false;	// Indicates whether all state should be wiped on startup or not
+	bool					 IsPowerCycle	  = false;	// When true, the process shuts down immediately after initialization
+	bool					 IsTest			  = false;
+	bool					 IsDedicated	  = false;	// Indicates a dedicated/shared instance, with larger resource requirements
+	bool					 ShouldCrash	  = false;	// Option for testing crash handling
+	bool					 IsFirstRun		  = false;
+	bool					 NoSentry		  = false;
+	bool					 SentryAllowPII	  = false;	// Allow personally identifiable information in sentry crash reports
+	std::string				 SentryDsn;
 	bool					 Detach				= true;	 // Whether zenserver should detach from existing process group (Mac/Linux)
 	bool					 ObjectStoreEnabled = false;
 	bool					 NoConsoleOutput	= false;  // Control default use of stdout for diagnostics
diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp
index b0d945814..868126533 100644
--- a/src/zenserver/main.cpp
+++ b/src/zenserver/main.cpp
@@ -96,17 +96,15 @@ ZenEntryPoint::Run()
 #if ZEN_USE_SENTRY
 	SentryIntegration Sentry;
 
-	if (m_ServerOptions.SentryConfig.Disable == false)
+	if (m_ServerOptions.NoSentry == false)
 	{
 		std::string SentryDatabasePath	 = (m_ServerOptions.DataDir / ".sentry-native").string();
 		std::string SentryAttachmentPath = m_ServerOptions.AbsLogFile.string();
 
-		Sentry.Initialize({.DatabasePath	= SentryDatabasePath,
-						   .AttachmentsPath = SentryAttachmentPath,
-						   .Dsn				= m_ServerOptions.SentryConfig.Dsn,
-						   .Environment		= m_ServerOptions.SentryConfig.Environment,
-						   .AllowPII		= m_ServerOptions.SentryConfig.AllowPII,
-						   .Debug			= m_ServerOptions.SentryConfig.Debug},
+		Sentry.Initialize(SentryDatabasePath,
+						  SentryAttachmentPath,
+						  m_ServerOptions.SentryDsn,
+						  m_ServerOptions.SentryAllowPII,
 						  m_ServerOptions.CommandLine);
 	}
 #endif
diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index 27ec4c690..1ad94ed63 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -137,7 +137,7 @@ ZenServer::Initialize(const ZenServerOptions& ServerOptions, ZenServerState::Zen
 		return -1;
 	}
 
-	m_UseSentry				 = ServerOptions.SentryConfig.Disable == false;
+	m_UseSentry				 = ServerOptions.NoSentry == false;
 	m_ServerEntry			 = ServerEntry;
 	m_DebugOptionForcedCrash = ServerOptions.ShouldCrash;
 	m_IsPowerCycle			 = ServerOptions.IsPowerCycle;