revert 61b4a88f and cadaad63

1 files changed, 25 insertions, 32 deletions

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