cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-23 21:16:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Probably fix shutdown delay condition with sessions

Browse Source
This commit is contained in:
Jordan Dominion
2023-11-26 21:25:35 -05:00
parent 0973174c10
commit 02c27eb52d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Chat/ChatTrackingContext.cs
+1 -1
View File
@@ -16,7 +16,7 @@ namespace Tgstation.Server.Host.Components.Chat
/// <inheritdoc />
public bool Active
{
get => active;
get => active && onDispose != null;
set
{
if (active == value)
src/Tgstation.Server.Host/Components/Session/SessionController.cs
+3 -3
View File
@@ -337,9 +337,8 @@ namespace Tgstation.Server.Host.Components.Session
Logger.LogTrace("Disposing...");
// yield then acquire the topic semaphore to prevent new calls from starting
await Task.Yield();
(await topicSendSemaphore.Lock(CancellationToken.None)).Dispose(); // DCT: None available
reattachTopicCts.Cancel();
var semaphoreLockTask = topicSendSemaphore.Lock(CancellationToken.None); // DCT: None available
if (!released)
{
@@ -363,6 +362,7 @@ namespace Tgstation.Server.Host.Components.Session
if (!released)
await Lifetime; // finish the async callback
(await semaphoreLockTask).Dispose();
topicSendSemaphore.Dispose();
}