Lock on connection. Fix logout timer with pings

ShokoAnime · Mar 24, 2024 · 9a79256 · 9a79256
1 parent 478d5e3
commit 9a79256
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Shoko.Server/Providers/AniDB/UDP/Connection/RequestPing.cs b/Shoko.Server/Providers/AniDB/UDP/Connection/RequestPing.cs
@@ -28,7 +28,7 @@ protected override void PreExecute(string sessionID)
 
     public override UDPResponse<Void> Send()
     {
-        var rawResponse = Handler.SendDirectly(BaseCommand, resetPingTimer: false).Result;
+        var rawResponse = Handler.SendDirectly(BaseCommand, resetPingTimer: false, resetLogoutTimer: false).Result;
         var response = ParseResponse(rawResponse);
         var parsedResponse = ParseResponse(response);
         return parsedResponse;

diff --git a/Shoko.Server/Scheduling/ThreadPooledJobStore.cs b/Shoko.Server/Scheduling/ThreadPooledJobStore.cs
@@ -11,6 +11,7 @@
 using Quartz.Spi;
 using Shoko.Server.Scheduling.Acquisition.Filters;
 using Shoko.Server.Scheduling.Concurrency;
+using Shoko.Server.Scheduling.DatabaseLocks;
 using Shoko.Server.Scheduling.Delegates;
 using Shoko.Server.Settings;
 using Shoko.Server.Utilities;
@@ -93,6 +94,20 @@ private void InitConcurrencyCache()
         foreach (var filter in _acquisitionFilters) filter.StateChanged -= FilterOnStateChanged;
     }
 
+    // These two should be called in equal amounts, so no worry of deadlock
+    protected override ConnectionAndTransactionHolder GetNonManagedTXConnection()
+    {
+        if (LockHandler is SQLiteSemaphore) LockHandler.ObtainLock(Guid.Empty, null, LockTriggerAccess).GetAwaiter().GetResult();
+        return base.GetNonManagedTXConnection();
+    }
+
+    protected override void CleanupConnection(ConnectionAndTransactionHolder conn)
+    {
+        if (conn == null) return;
+        if (LockHandler is SQLiteSemaphore) LockHandler.ReleaseLock(Guid.Empty, LockTriggerAccess).GetAwaiter().GetResult();
+        CloseConnection(conn);
+    }
+
     private void FilterOnStateChanged(object sender, EventArgs e)
     {
         SignalSchedulingChangeImmediately(new DateTimeOffset(1982, 6, 28, 0, 0, 0, TimeSpan.FromSeconds(0)));