Establish stricter client timeout (#20)

gwdevhub · Nov 26, 2023 · 174794b · 174794b
1 parent f211b3c
commit 174794b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/GuildWarsPartySearch/Launch/Program.cs b/GuildWarsPartySearch/Launch/Program.cs
@@ -32,7 +32,7 @@ private static async Task Main()
             .AddHandler(new HttpHandler()
                 .AddHttpModule(new ContentModule()))
             .AddServerUsageMonitor(new TickrateEnforcer() { TicksPerSecond = 60, Silent = true })
-            .SetScheduler(new TaskAwaiterScheduler())
+            .SetScheduler(new FireTasksAndForgetScheduler())
             .WithLoggingMessageContents(false);
         var serverOptions = httpsServer.ServiceManager.GetRequiredService<IOptions<ServerOptions>>();
         httpsServer.WithCertificate(serverOptions.Value.Certificate);
@@ -45,7 +45,7 @@ private static async Task Main()
         httpServer.AddHandler(new HttpHandler()
             .AddHttpModule(new ContentModule()))
             .AddServerUsageMonitor(new TickrateEnforcer { TicksPerSecond = 10, Silent = true })
-            .SetScheduler(new TaskAwaiterScheduler())
+            .SetScheduler(new FireTasksAndForgetScheduler())
             .WithLoggingMessageContents(false);
 
         var httpsServerTask = httpsServer.RunAsync(CancellationTokenSource.Token);

diff --git a/GuildWarsPartySearch/ServerHandlers/ConnectionMonitorHandler.cs b/GuildWarsPartySearch/ServerHandlers/ConnectionMonitorHandler.cs
@@ -35,11 +35,8 @@ void IHandler.Tick(MTSC.ServerSide.Server server)
         {
             if (DateTime.Now - client.LastActivityTime > inactivityTimeout)
             {
-                if (!IsConnected(client.Socket))
-                {
-                    server.Log("Disconnected: " + client.Socket.RemoteEndPoint?.ToString());
-                    client.ToBeRemoved = true;
-                }
+                server.Log("Disconnected: " + client.Socket.RemoteEndPoint?.ToString());
+                client.ToBeRemoved = true;
             }
         }
     }