Fix not flushing logs when calling Environment.Exit

Agent/Phantom.Agent.Services/Rpc/MessageListener.cs

@@ -54,6 +54,8 @@ public sealed class MessageListener : IMessageToAgentListener {
 		};
 
 		Logger.Fatal("Agent authentication failed: {Error}", errorMessage);
+		
+		PhantomLogger.Dispose();
 		Environment.Exit(1);
 
 		return Task.FromResult(NoReply.Instance);

Agent/Phantom.Agent/Program.cs

@@ -25,21 +25,21 @@ try {
 	PhantomLogger.Root.InformationHeading("Initializing Phantom Panel agent...");
 	PhantomLogger.Root.Information("Agent version: {Version}", fullVersion);
 
-	var (serverHost, serverPort, javaSearchPath, agentKeyToken, agentKeyFilePath, agentName, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts, maxConcurrentBackupCompressionTasks) = Variables.LoadOrExit();
+	var (serverHost, serverPort, javaSearchPath, agentKeyToken, agentKeyFilePath, agentName, maxInstances, maxMemory, allowedServerPorts, allowedRconPorts, maxConcurrentBackupCompressionTasks) = Variables.LoadOrStop();
 
 	var agentKey = await AgentKey.Load(agentKeyToken, agentKeyFilePath);
 	if (agentKey == null) {
-		Environment.Exit(1);
+		return 1;
 	}
 
 	var folders = new AgentFolders("./data", "./temp", javaSearchPath);
 	if (!folders.TryCreate()) {
-		Environment.Exit(1);
+		return 1;
 	}
 
 	var agentGuid = await GuidFile.CreateOrLoad(folders.DataFolderPath);
 	if (agentGuid == null) {
-		Environment.Exit(1);
+		return 1;
 	}
 
 	var (serverCertificate, agentToken) = agentKey.Value;
@@ -67,10 +67,15 @@ try {
 		await rpcTask;
 		rpcDisconnectSemaphore.Dispose();
 	}
+
+	return 0;
 } catch (OperationCanceledException) {
-	// Ignore.
+	return 0;
+} catch (StopProcedureException) {
+	return 1;
 } catch (Exception e) {
 	PhantomLogger.Root.Fatal(e, "Caught exception in entry point.");
+	return 1;
 } finally {
 	shutdownCancellationTokenSource.Dispose();
 

Agent/Phantom.Agent/Variables.cs

@@ -41,13 +41,12 @@ sealed record Variables(
 		return JavaRuntimeDiscovery.GetSystemSearchPath() ?? throw new Exception("Could not automatically determine the path to Java installations on this system. Please set the JAVA_SEARCH_PATH environment variable to the folder containing Java installations.");
 	}
 
-	public static Variables LoadOrExit() {
+	public static Variables LoadOrStop() {
 		try {
 			return LoadOrThrow();
 		} catch (Exception e) {
 			PhantomLogger.Root.Fatal(e.Message);
-			Environment.Exit(1);
+			throw StopProcedureException.Instance;
-			throw;
 		}
 	}
 }

Server/Phantom.Server/Program.cs

@@ -15,19 +15,18 @@ using WebConfiguration = Phantom.Server.Web.Configuration;
 using WebLauncher = Phantom.Server.Web.Launcher;
 
 var cancellationTokenSource = new CancellationTokenSource();
-var taskManager = new TaskManager(PhantomLogger.Create<TaskManager>("Server"));
 
 PosixSignals.RegisterCancellation(cancellationTokenSource, static () => {
 	PhantomLogger.Root.InformationHeading("Stopping Phantom Panel server...");
 });
 
-static void CreateFolderOrExit(string path, UnixFileMode chmod) {
+static void CreateFolderOrStop(string path, UnixFileMode chmod) {
 	if (!Directory.Exists(path)) {
 		try {
 			Directories.Create(path, chmod);
 		} catch (Exception e) {
 			PhantomLogger.Root.Fatal(e, "Error creating folder: {FolderName}", path);
-			Environment.Exit(1);
+			throw StopProcedureException.Instance;
 		}
 	}
 }
@@ -38,49 +37,56 @@ try {
 	PhantomLogger.Root.InformationHeading("Initializing Phantom Panel server...");
 	PhantomLogger.Root.Information("Server version: {Version}", fullVersion);
 	
-	var (webServerHost, webServerPort, webBasePath, rpcServerHost, rpcServerPort, sqlConnectionString) = Variables.LoadOrExit();
+	var (webServerHost, webServerPort, webBasePath, rpcServerHost, rpcServerPort, sqlConnectionString) = Variables.LoadOrStop();
 
 	string secretsPath = Path.GetFullPath("./secrets");
-	CreateFolderOrExit(secretsPath, Chmod.URWX_GRX);
+	CreateFolderOrStop(secretsPath, Chmod.URWX_GRX);
 	
 	string webKeysPath = Path.GetFullPath("./keys");
-	CreateFolderOrExit(webKeysPath, Chmod.URWX);
+	CreateFolderOrStop(webKeysPath, Chmod.URWX);
 
 	var certificateData = await CertificateFiles.CreateOrLoad(secretsPath);
 	if (certificateData == null) {
-		Environment.Exit(1);
+		return 1;
 	}
 	
 	var (certificate, agentToken) = certificateData.Value;
 	
-	var rpcConfiguration = new RpcConfiguration(PhantomLogger.Create("Rpc"), PhantomLogger.Create<TaskManager>("Rpc"), rpcServerHost, rpcServerPort, certificate);
-	var webConfiguration = new WebConfiguration(PhantomLogger.Create("Web"), webServerHost, webServerPort, webBasePath, webKeysPath, cancellationTokenSource.Token);
-
 	PhantomLogger.Root.InformationHeading("Launching Phantom Panel server...");
 	
-	var administratorToken = TokenGenerator.Create(60);
+	var taskManager = new TaskManager(PhantomLogger.Create<TaskManager>("Server"));
-	PhantomLogger.Root.Information("Your administrator token is: {AdministratorToken}", administratorToken);
+	try {
-	PhantomLogger.Root.Information("For administrator setup, visit: {HttpUrl}{SetupPath}", webConfiguration.HttpUrl, webConfiguration.BasePath + "setup");
+		var rpcConfiguration = new RpcConfiguration(PhantomLogger.Create("Rpc"), PhantomLogger.Create<TaskManager>("Rpc"), rpcServerHost, rpcServerPort, certificate);
+		var webConfiguration = new WebConfiguration(PhantomLogger.Create("Web"), webServerHost, webServerPort, webBasePath, webKeysPath, cancellationTokenSource.Token);
 
-	var serviceConfiguration = new ServiceConfiguration(fullVersion, TokenGenerator.GetBytesOrThrow(administratorToken), cancellationTokenSource.Token);
+		var administratorToken = TokenGenerator.Create(60);
-	var webConfigurator = new WebConfigurator(serviceConfiguration, taskManager, agentToken);
+		PhantomLogger.Root.Information("Your administrator token is: {AdministratorToken}", administratorToken);
-	var webApplication = await WebLauncher.CreateApplication(webConfiguration, webConfigurator, options => options.UseNpgsql(sqlConnectionString, static options => {
+		PhantomLogger.Root.Information("For administrator setup, visit: {HttpUrl}{SetupPath}", webConfiguration.HttpUrl, webConfiguration.BasePath + "setup");
-		options.CommandTimeout(10).MigrationsAssembly(typeof(ApplicationDbContextDesignFactory).Assembly.FullName);
-	}));
 
-	await Task.WhenAll(
+		var serviceConfiguration = new ServiceConfiguration(fullVersion, TokenGenerator.GetBytesOrThrow(administratorToken), cancellationTokenSource.Token);
-		RpcLauncher.Launch(rpcConfiguration, webApplication.Services.GetRequiredService<MessageToServerListenerFactory>().CreateListener, cancellationTokenSource.Token),
+		var webConfigurator = new WebConfigurator(serviceConfiguration, taskManager, agentToken);
-		WebLauncher.Launch(webConfiguration, webApplication)
+		var webApplication = await WebLauncher.CreateApplication(webConfiguration, webConfigurator, options => options.UseNpgsql(sqlConnectionString, static options => {
-	);
+			options.CommandTimeout(10).MigrationsAssembly(typeof(ApplicationDbContextDesignFactory).Assembly.FullName);
+		}));
+
+		await Task.WhenAll(
+			RpcLauncher.Launch(rpcConfiguration, webApplication.Services.GetRequiredService<MessageToServerListenerFactory>().CreateListener, cancellationTokenSource.Token),
+			WebLauncher.Launch(webConfiguration, webApplication)
+		);
+	} finally {
+		cancellationTokenSource.Cancel();
+		await taskManager.Stop();
+	}
+
+	return 0;
 } catch (OperationCanceledException) {
-	// Ignore.
+	return 0;
 } catch (StopProcedureException) {
-	// Ignore.
+	return 1;
+} catch (Exception e) {
+	PhantomLogger.Root.Fatal(e, "Caught exception in entry point.");
+	return 1;
 } finally {
-	cancellationTokenSource.Cancel();
-	
-	await taskManager.Stop();
-	
 	cancellationTokenSource.Dispose();
 	PhantomLogger.Root.Information("Bye!");
 	PhantomLogger.Dispose();

Server/Phantom.Server/Variables.cs

@@ -31,13 +31,12 @@ sealed record Variables(
 		);
 	}
 
-	public static Variables LoadOrExit() {
+	public static Variables LoadOrStop() {
 		try {
 			return LoadOrThrow();
 		} catch (Exception e) {
 			PhantomLogger.Root.Fatal(e.Message);
-			Environment.Exit(1);
+			throw StopProcedureException.Instance;
-			throw;
 		}
 	}
 }