Fix server stalling after CLI invocation

LittleBigRefresh · Oct 1, 2023 · 3843476 · 3843476
1 parent 50be1e8
commit 3843476
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/Refresh.GameServer/CommandLineManager.cs b/Refresh.GameServer/CommandLineManager.cs
@@ -66,7 +66,7 @@ private void StartWithOptions(Options options)
 
         if (options.GenerateDocumentation)
         {
-            DocumentationService service = new(new Logger());
+            DocumentationService service = new(this._server.Logger);
             service.Initialize();
 
             string json = JsonConvert.SerializeObject(service.Documentation, Formatting.Indented);

diff --git a/Refresh.GameServer/RefreshGameServer.cs b/Refresh.GameServer/RefreshGameServer.cs
@@ -28,9 +28,9 @@
 namespace Refresh.GameServer;
 
 [SuppressMessage("ReSharper", "InconsistentNaming")]
-public class RefreshGameServer
+public class RefreshGameServer : IDisposable
 {
-    protected readonly Logger _logger;
+    public readonly Logger Logger;
 
     protected readonly BunkumHttpServer _server;
     protected WorkerManager? _workerManager;
@@ -61,8 +61,8 @@ public RefreshGameServer(
             #endif
         };
 
-        this._logger = new Logger(logConfig);
-        this._logger.LogDebug(RefreshContext.Startup, "Successfully initialized " + this.GetType().Name);
+        this.Logger = new Logger(logConfig);
+        this.Logger.LogDebug(RefreshContext.Startup, "Successfully initialized " + this.GetType().Name);
 
         this._databaseProvider = databaseProvider.Invoke();
         this._dataStore = dataStore;
@@ -74,7 +74,7 @@ public RefreshGameServer(
             GameDatabaseProvider provider = databaseProvider.Invoke();
 
             this._workerManager?.Stop();
-            this._workerManager = new WorkerManager(this._logger, this._dataStore, provider);
+            this._workerManager = new WorkerManager(this.Logger, this._dataStore, provider);
 
             this.SetupConfiguration();
             authProvider ??= new GameAuthenticationProvider(this._config!);
@@ -171,7 +171,7 @@ public virtual void Start()
 
         if (this._config!.MaintenanceMode)
         {
-            this._logger.LogWarning(RefreshContext.Startup, "The server is currently in maintenance mode! " +
+            this.Logger.LogWarning(RefreshContext.Startup, "The server is currently in maintenance mode! " +
                                                             "Only administrators will be able to log in and interact with the server.");
         }
     }
@@ -242,4 +242,11 @@ public void SetAdminFromEmailAddress(string emailAddress)
 
         context.SetUserRole(user, GameUserRole.Admin);
     }
+
+    public void Dispose()
+    {
+        this.Logger.Dispose();
+        this._databaseProvider.Dispose();
+        GC.SuppressFinalize(this);
+    }
 }
diff --git a/Refresh.GameServer/Startup.cs b/Refresh.GameServer/Startup.cs
@@ -9,12 +9,14 @@
 Console.WriteLine("Starting Refresh with NuGet Bunkum");
 #endif
 
-RefreshGameServer server = new();
+using RefreshGameServer server = new();
 
 if (args.Length > 0)
 {
     CommandLineManager cli = new(server);
     cli.StartWithArgs(args);
+
+    server.Dispose();
     return;
 }
 

diff --git a/Refresh.GameServer/Workers/WorkerManager.cs b/Refresh.GameServer/Workers/WorkerManager.cs
@@ -55,7 +55,7 @@ private bool RunWorkCycle()
             if (workerDidWork) didWork = true;
         }
 
-        // this._logger.LogTrace(RefreshContext.Worker, "Ran work cycle, didWork: " + didWork);
+        // this.Logger.LogTrace(RefreshContext.Worker, "Ran work cycle, didWork: " + didWork);
         return didWork;
     }
 

diff --git a/RefreshTests.GameServer/GameServer/TestRefreshGameServer.cs b/RefreshTests.GameServer/GameServer/TestRefreshGameServer.cs
@@ -16,7 +16,7 @@ public class TestRefreshGameServer : RefreshGameServer
     {}
 
     public BunkumHttpServer Server => this._server;
-    public Logger Logger => this._logger;
+    public Logger Logger => base.Logger;
 
     protected override void SetupConfiguration()
     {